Simplify render in controllers (#2144)

diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb
index 1932dc6a820da37698f15e89f2a2c4d09264dad0..d40ec829bfc5bda8286836243315558ab06e4499 100644 (file)
--- a/app/controllers/admin/domain_blocks_controller.rb
+++ b/app/controllers/admin/domain_blocks_controller.rb
@@ -17,7 +17,7 @@ module Admin
         DomainBlockWorker.perform_async(@domain_block.id)
         redirect_to admin_domain_blocks_path, notice: I18n.t('admin.domain_blocks.created_msg')
       else
-        render action: :new
+        render :new
       end
     end
 

diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 2c44e36a77bd53cae76f966cbab67e49ba791322..5724dbaea4f6b09c0517cd30f8199c00e0f8f020 100644 (file)
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -13,13 +13,13 @@ class Api::V1::AccountsController < ApiController
 
   def verify_credentials
     @account = current_user.account
-    render action: :show
+    render :show
   end
 
   def update_credentials
     current_account.update!(account_params)
     @account = current_account
-    render action: :show
+    render :show
   end
 
   def following
@@ -32,7 +32,7 @@ class Api::V1::AccountsController < ApiController
 
     set_pagination_headers(next_path, prev_path)
 
-    render action: :index
+    render :index
   end
 
   def followers
@@ -45,7 +45,7 @@ class Api::V1::AccountsController < ApiController
 
     set_pagination_headers(next_path, prev_path)
 
-    render action: :index
+    render :index
   end
 
   def statuses
@@ -65,7 +65,7 @@ class Api::V1::AccountsController < ApiController
   def follow
     FollowService.new.call(current_user.account, @account.acct)
     set_relationship
-    render action: :relationship
+    render :relationship
   end
 
   def block
@@ -77,31 +77,31 @@ class Api::V1::AccountsController < ApiController
     @requested   = { @account.id => false }
     @muting      = { @account.id => current_user.account.muting?(@account.id) }
 
-    render action: :relationship
+    render :relationship
   end
 
   def mute
     MuteService.new.call(current_user.account, @account)
     set_relationship
-    render action: :relationship
+    render :relationship
   end
 
   def unfollow
     UnfollowService.new.call(current_user.account, @account)
     set_relationship
-    render action: :relationship
+    render :relationship
   end
 
   def unblock
     UnblockService.new.call(current_user.account, @account)
     set_relationship
-    render action: :relationship
+    render :relationship
   end
 
   def unmute
     UnmuteService.new.call(current_user.account, @account)
     set_relationship
-    render action: :relationship
+    render :relationship
   end
 
   def relationships
@@ -118,7 +118,7 @@ class Api::V1::AccountsController < ApiController
   def search
     @accounts = AccountSearchService.new.call(params[:q], limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:resolve] == 'true', current_account)
 
-    render action: :index
+    render :index
   end
 
   private

diff --git a/app/controllers/api/v1/follows_controller.rb b/app/controllers/api/v1/follows_controller.rb
index 7c0f44f038313ca07a807cb8caec2731aa5a4d2f..67d823398a686b7bf406975858c7bd64a64ea3ef 100644 (file)
--- a/app/controllers/api/v1/follows_controller.rb
+++ b/app/controllers/api/v1/follows_controller.rb
@@ -10,7 +10,7 @@ class Api::V1::FollowsController < ApiController
     raise ActiveRecord::RecordNotFound if follow_params[:uri].blank?
 
     @account = FollowService.new.call(current_user.account, target_uri).try(:target_account)
-    render action: :show
+    render :show
   end
 
   private

diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index e88f9cc41bd06165642e30a9146af293dde2eb17..5a2e18cc0570def335b42a10603f02d0bfbcf6ce 100644 (file)
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -40,7 +40,7 @@ class Api::V1::StatusesController < ApiController
 
     set_pagination_headers(next_path, prev_path)
 
-    render action: :accounts
+    render :accounts
   end
 
   def favourited_by
@@ -53,7 +53,7 @@ class Api::V1::StatusesController < ApiController
 
     set_pagination_headers(next_path, prev_path)
 
-    render action: :accounts
+    render :accounts
   end
 
   def create
@@ -62,7 +62,7 @@ class Api::V1::StatusesController < ApiController
                                                                                                                                                                                   spoiler_text: status_params[:spoiler_text],
                                                                                                                                                                                   visibility: status_params[:visibility],
                                                                                                                                                                                   application: doorkeeper_token.application)
-    render action: :show
+    render :show
   end
 
   def destroy
@@ -73,7 +73,7 @@ class Api::V1::StatusesController < ApiController
 
   def reblog
     @status = ReblogService.new.call(current_user.account, Status.find(params[:id]))
-    render action: :show
+    render :show
   end
 
   def unreblog
@@ -83,12 +83,12 @@ class Api::V1::StatusesController < ApiController
 
     RemovalWorker.perform_async(reblog.id)
 
-    render action: :show
+    render :show
   end
 
   def favourite
     @status = FavouriteService.new.call(current_user.account, Status.find(params[:id])).status.reload
-    render action: :show
+    render :show
   end
 
   def unfavourite
@@ -97,7 +97,7 @@ class Api::V1::StatusesController < ApiController
 
     UnfavouriteWorker.perform_async(current_user.account_id, @status.id)
 
-    render action: :show
+    render :show
   end
 
   private

diff --git a/app/controllers/api/v1/timelines_controller.rb b/app/controllers/api/v1/timelines_controller.rb
index e55e7d7181f93799cb206893ed250e8a4e82e809..27dc3d0efd7418b340f126702b3bedffee19232c 100644 (file)
--- a/app/controllers/api/v1/timelines_controller.rb
+++ b/app/controllers/api/v1/timelines_controller.rb
@@ -17,7 +17,7 @@ class Api::V1::TimelinesController < ApiController
 
     set_pagination_headers(next_path, prev_path)
 
-    render action: :index
+    render :index
   end
 
   def public
@@ -31,7 +31,7 @@ class Api::V1::TimelinesController < ApiController
 
     set_pagination_headers(next_path, prev_path)
 
-    render action: :index
+    render :index
   end
 
   def tag
@@ -46,7 +46,7 @@ class Api::V1::TimelinesController < ApiController
 
     set_pagination_headers(next_path, prev_path)
 
-    render action: :index
+    render :index
   end
 
   private

diff --git a/app/controllers/settings/imports_controller.rb b/app/controllers/settings/imports_controller.rb
index cbb5e65da51faa56b9a3835edef54ca8aae93387..0db13d1ca640586d8970a476ad352b996c96d762 100644 (file)
--- 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 5d8cb76287e9ece89c311fcbeec2ba663ce44c5e..31a2044209d331f47ce2e5fbeddd288d28fbee2f 100644 (file)
--- 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 2b74b4e949e43a5f346732ad974cd69993fb7b24..0367e3593648d6218bbe828bc79c6bf284b1f3dd 100644 (file)
--- 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 bfe3868f3b7328fd3fbb8fbf32ce283dca8ae92e..a06b2a9f9220bb422646ba8e537905c03c8d03dd 100644 (file)
--- 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