summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-10-20 11:40:59 +0200
committerDouwe Maan <douwe@selenight.nl>2016-10-20 11:40:59 +0200
commit1f949c0a6b08563f3abcd9fd4c9e750c4097b44b (patch)
tree2292964b5957a3bcb75556b35fe6286510cf78e1
parentb5cee66612fca4f1fb9791f1c8615039d1703df3 (diff)
parent325a5bafcc8a37b7d2ed1416b2952862066a914f (diff)
downloadgitlab-ce-1f949c0a6b08563f3abcd9fd4c9e750c4097b44b.tar.gz
Merge branch '6967-toggle_award_url'
-rw-r--r--CHANGELOG.md1
-rw-r--r--app/helpers/award_emoji_helper.rb4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cb848c3957..dfde2cc81e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
## 8.14.0 (2016-11-22)
- Adds user project membership expired event to clarify why user was removed (Callum Dryden)
+ - Simpler arguments passed to named_route on toggle_award_url helper method
## 8.13.0 (2016-10-22)
diff --git a/app/helpers/award_emoji_helper.rb b/app/helpers/award_emoji_helper.rb
index 592ffe7b89f..167b09e678f 100644
--- a/app/helpers/award_emoji_helper.rb
+++ b/app/helpers/award_emoji_helper.rb
@@ -3,8 +3,8 @@ module AwardEmojiHelper
return url_for([:toggle_award_emoji, awardable]) unless @project
if awardable.is_a?(Note)
- # We render a list of notes very frequently and calling the specific method is a lot faster than the generic one (6.5x)
- toggle_award_emoji_namespace_project_note_url(namespace_id: @project.namespace, project_id: @project, id: awardable.id)
+ # We render a list of notes very frequently and calling the specific method is a lot faster than the generic one (4.5x)
+ toggle_award_emoji_namespace_project_note_url(@project.namespace, @project, awardable.id)
else
url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable])
end