diff options
| author | Patrick Derichs <pderichs@gitlab.com> | 2019-08-01 10:42:12 +0200 |
|---|---|---|
| committer | Patrick Derichs <pderichs@gitlab.com> | 2019-08-01 10:58:17 +0200 |
| commit | e13b5dc7540b85673e066a7a7c26fc3abbecbfe7 (patch) | |
| tree | efa191c1a7e3679e10dc982d14a0aeecac48aa07 | |
| parent | 0e99daae4afdb90d74c4b0bfe5cb3e482bbb422e (diff) | |
| download | gitlab-ce-52123-issuable-actions-notesfinder-pderichs.tar.gz | |
Change block parameter name to params52123-issuable-actions-notesfinder-pderichs
| -rw-r--r-- | app/controllers/concerns/issuable_actions.rb | 2 | ||||
| -rw-r--r-- | 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 |