summaryrefslogtreecommitdiff
path: root/app/views/award_emoji
diff options
context:
space:
mode:
authorArinde Eniola <eniolaarinde1@gmail.com>2016-04-25 09:09:39 +0100
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-05-06 10:47:12 +0200
commit4eb16290e4e95c0a9bcf3d01ecc8060d91eec021 (patch)
tree6f978f35c25d33e567e57fc22beb92b5b2f8c931 /app/views/award_emoji
parent3bdc57f0a710b3769381ecad7ea4098223ecff56 (diff)
downloadgitlab-ce-4eb16290e4e95c0a9bcf3d01ecc8060d91eec021.tar.gz
move frontend logic from previous MR to new MR
Diffstat (limited to 'app/views/award_emoji')
-rw-r--r--app/views/award_emoji/_awards_block.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml
index 63c953195fe..b57c9afcbd2 100644
--- a/app/views/award_emoji/_awards_block.html.haml
+++ b/app/views/award_emoji/_awards_block.html.haml
@@ -1,7 +1,7 @@
-- grouped_awards = awardable.grouped_awards(inline)
+- grouped_emojis = awardable.grouped_awards(inline)
.awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.size == 0), data: { award_url: url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable]) } }
- - awards_sort(grouped_awards).each do |emoji, awards|
- %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), title: award_user_list(awards, current_user), data: { placement: "bottom" } }
+ - awards_sort(grouped_emojis).each do |emoji, awards|
+ %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)),data: { placement: "bottom", original_title: award_user_list(awards, current_user)} }
= emoji_icon(emoji)
%span.award-control-text.js-counter
= awards.count