diff options
author | Phil Hughes <me@iamphill.com> | 2016-10-18 14:23:44 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-10-18 14:23:44 +0300 |
commit | a1deb6ece3be68fb176eb08a6371a334b24b4f01 (patch) | |
tree | 7b5c300c34507efa05a885a6a51f3924b508dc52 /app/helpers | |
parent | da07c2e4d3d382c05ec287ee60f639b870074fe7 (diff) | |
parent | c9d7ba4d696bfd0198ac75db6e1b2a08b4517f82 (diff) |
Merge branch 'master' into issue_19734_2
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/award_emoji_helper.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/helpers/award_emoji_helper.rb b/app/helpers/award_emoji_helper.rb index aa134cea31c..493f14f6f9d 100644 --- a/app/helpers/award_emoji_helper.rb +++ b/app/helpers/award_emoji_helper.rb @@ -1,9 +1,12 @@ module AwardEmojiHelper def toggle_award_url(awardable) - if @project - url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable]) + 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_id, project_id: @project.id, id: awardable.id) else - url_for([:toggle_award_emoji, awardable]) + url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable]) end end end |