about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorMatt Jankowski <mjankowski@thoughtbot.com>2017-04-19 09:37:42 -0400
committerEugen <eugen@zeonfederated.com>2017-04-19 15:37:42 +0200
commita8e1afc30a1f843943bb29e7385b8611ea3c29f4 (patch)
treec37ec1d7c086943da8bb126fde19f312d5efcad9 /app/controllers/settings
parentbfbc2ca0d8dcef47f8581585b42f13b6b4c933d9 (diff)
Simplify render in controllers (#2144)
Diffstat (limited to 'app/controllers/settings')
-rw-r--r--app/controllers/settings/imports_controller.rb2
-rw-r--r--app/controllers/settings/preferences_controller.rb2
-rw-r--r--app/controllers/settings/profiles_controller.rb2
-rw-r--r--app/controllers/settings/two_factor_auths_controller.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/settings/imports_controller.rb b/app/controllers/settings/imports_controller.rb
index cbb5e65da..0db13d1ca 100644
--- a/app/controllers/settings/imports_controller.rb
+++ b/app/controllers/settings/imports_controller.rb
@@ -18,7 +18,7 @@ class Settings::ImportsController < ApplicationController
       ImportWorker.perform_async(@import.id)
       redirect_to settings_import_path, notice: I18n.t('imports.success')
     else
-      render action: :show
+      render :show
     end
   end
 
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 5d8cb7628..31a204420 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -29,7 +29,7 @@ class Settings::PreferencesController < ApplicationController
     if current_user.update(user_params.except(:notification_emails, :interactions, :setting_default_privacy, :setting_boost_modal, :setting_auto_play_gif))
       redirect_to settings_preferences_path, notice: I18n.t('generic.changes_saved_msg')
     else
-      render action: :show
+      render :show
     end
   end
 
diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb
index 2b74b4e94..0367e3593 100644
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@@ -17,7 +17,7 @@ class Settings::ProfilesController < ApplicationController
     if @account.update(account_params)
       redirect_to settings_profile_path, notice: I18n.t('generic.changes_saved_msg')
     else
-      render action: :show
+      render :show
     end
   end
 
diff --git a/app/controllers/settings/two_factor_auths_controller.rb b/app/controllers/settings/two_factor_auths_controller.rb
index bfe3868f3..a06b2a9f9 100644
--- a/app/controllers/settings/two_factor_auths_controller.rb
+++ b/app/controllers/settings/two_factor_auths_controller.rb
@@ -26,7 +26,7 @@ class Settings::TwoFactorAuthsController < ApplicationController
       @confirmation = Form::TwoFactorConfirmation.new
       set_qr_code
       flash.now[:alert] = I18n.t('two_factor_auth.wrong_code')
-      render action: :new
+      render :new
     end
   end