From e13b5dc7540b85673e066a7a7c26fc3abbecbfe7 Mon Sep 17 00:00:00 2001 From: Patrick Derichs Date: Thu, 1 Aug 2019 10:42:12 +0200 Subject: Change block parameter name to params --- app/controllers/concerns/issuable_actions.rb | 2 +- app/controllers/snippets/notes_controller.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb index 8a27b7f1c5f..398cb728e05 100644 --- a/app/controllers/concerns/issuable_actions.rb +++ b/app/controllers/concerns/issuable_actions.rb @@ -227,7 +227,7 @@ module IssuableActions { target: @issuable, notes_filter: notes_filter - }.tap { |hash| hash[:project] = project if respond_to?(:project, true) } + }.tap { |new_params| new_params[:project] = project if respond_to?(:project, true) } end # rubocop:enable Gitlab/ModuleWithInstanceVariables end diff --git a/app/controllers/snippets/notes_controller.rb b/app/controllers/snippets/notes_controller.rb index 1f016493c1f..551b37cb3d3 100644 --- a/app/controllers/snippets/notes_controller.rb +++ b/app/controllers/snippets/notes_controller.rb @@ -27,8 +27,8 @@ class Snippets::NotesController < ApplicationController alias_method :noteable, :snippet def finder_params - params.merge(last_fetched_at: last_fetched_at, target_id: snippet.id, target_type: 'personal_snippet').tap do |hash| - hash[:project] = project if respond_to?(:project) + params.merge(last_fetched_at: last_fetched_at, target_id: snippet.id, target_type: 'personal_snippet').tap do |merged_params| + merged_params[:project] = project if respond_to?(:project) end end -- cgit v1.2.1