summaryrefslogtreecommitdiff
path: root/app/helpers/notes_helper.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-08-17 19:27:11 +0200
committerDouwe Maan <douwe@selenight.nl>2017-08-17 19:27:11 +0200
commit7c491d4fefbd0a079a497e5cae07056bfe467622 (patch)
tree5e41c07992069943d6b4eff30b9f6a70b82f317a /app/helpers/notes_helper.rb
parent5f758aff57dc54df7d92d0fb63e706d58cf1093d (diff)
downloadgitlab-ce-7c491d4fefbd0a079a497e5cae07056bfe467622.tar.gz
Misc tweaks
Diffstat (limited to 'app/helpers/notes_helper.rb')
-rw-r--r--app/helpers/notes_helper.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index ea20f4b8d87..8c5e258f519 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -93,13 +93,13 @@ module NotesHelper
end
end
- def notes_url(extra_params = {})
+ def notes_url(params = {})
if @snippet.is_a?(PersonalSnippet)
- snippet_notes_path(@snippet, extra_params)
+ snippet_notes_path(@snippet, params)
else
- params = { target_id: @noteable.id, target_type: @noteable.class.name.underscore }
+ params.merge!(target_id: @noteable.id, target_type: @noteable.class.name.underscore)
- project_noteable_notes_path(@project, params.merge(extra_params))
+ project_noteable_notes_path(@project, params)
end
end