commit: a8e1afc30a1f843943bb29e7385b8611ea3c29f4 parent: bfbc2ca0d8dcef47f8581585b42f13b6b4c933d9 Author: Matt Jankowski <mjankowski@thoughtbot.com> Date: Wed, 19 Apr 2017 09:37:42 -0400 Simplify render in controllers (#2144)Diffstat:
9 files changed, 27 insertions(+), 27 deletions(-)
diff --git 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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