summaryrefslogtreecommitdiff
path: root/app/views/award_emoji
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-05-19 17:50:20 -0500
committerMike Greiling <mike@pixelcog.com>2017-05-19 17:50:20 -0500
commite068558f79720845bb94ac61f484d17d193051c1 (patch)
treedd0e92cbbe5e3848d316e6a9f2b7f5d0d747608e /app/views/award_emoji
parent9d2d104293f7a4e012de14c6df2601aa59bfe884 (diff)
downloadgitlab-ce-e068558f79720845bb94ac61f484d17d193051c1.tar.gz
rename "Add emoji" and "Award emoji" to "Add reaction" where appropriate32462-award-emoji-tooltip-should-be-add-reaction
Diffstat (limited to 'app/views/award_emoji')
-rw-r--r--app/views/award_emoji/_awards_block.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml
index 9aabfb49a29..5f07d2720c2 100644
--- a/app/views/award_emoji/_awards_block.html.haml
+++ b/app/views/award_emoji/_awards_block.html.haml
@@ -12,9 +12,9 @@
- if current_user
.award-menu-holder.js-award-holder
%button.btn.award-control.has-tooltip.js-add-award{ type: 'button',
- 'aria-label': 'Add emoji',
+ 'aria-label': 'Add reaction',
class: ("js-user-authored" if user_authored),
- data: { title: 'Add emoji', placement: "bottom" } }
+ data: { title: 'Add reaction', placement: "bottom" } }
%span{ class: "award-control-icon award-control-icon-neutral" }= custom_icon('emoji_slightly_smiling_face')
%span{ class: "award-control-icon award-control-icon-positive" }= custom_icon('emoji_smiley')
%span{ class: "award-control-icon award-control-icon-super-positive" }= custom_icon('emoji_smile')