Merge remote-tracking branch 'upstream/pull/5666'

[rails.git] / app / controllers / preferences_controller.rb

diff --git a/app/controllers/preferences_controller.rb b/app/controllers/preferences_controller.rb
index 1d96766ef227b7dbaa86b870f03ca1534c8513c6..910f6a24fc44350e490b771d34fb417dd5cedfa0 100644 (file)
--- a/app/controllers/preferences_controller.rb
+++ b/app/controllers/preferences_controller.rb
@@ -11,8 +11,6 @@ class PreferencesController < ApplicationController
 
   def show; end
 
-  def edit; end
-
   def update
     current_user.languages = params[:user][:languages].split(",")
 
@@ -40,7 +38,7 @@ class PreferencesController < ApplicationController
       redirect_to preferences_path
     else
       flash.now[:error] = t ".failure"
-      render :edit
+      render :show
     end
   end
 end