Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-05-20 01:50:20 +0300
committerMike Greiling <mike@pixelcog.com>2017-05-20 01:50:20 +0300
commite068558f79720845bb94ac61f484d17d193051c1 (patch)
treedd0e92cbbe5e3848d316e6a9f2b7f5d0d747608e /app/views/snippets
parent9d2d104293f7a4e012de14c6df2601aa59bfe884 (diff)
rename "Add emoji" and "Award emoji" to "Add reaction" where appropriate
Diffstat (limited to 'app/views/snippets')
-rw-r--r--app/views/snippets/notes/_actions.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/snippets/notes/_actions.html.haml b/app/views/snippets/notes/_actions.html.haml
index 679a5e934da..e8119642ab8 100644
--- a/app/views/snippets/notes/_actions.html.haml
+++ b/app/views/snippets/notes/_actions.html.haml
@@ -1,7 +1,7 @@
- if current_user
- if note.emoji_awardable?
- user_authored = note.user_authored?(current_user)
- = link_to '#', title: 'Award Emoji', class: "note-action-button note-emoji-button js-add-award js-note-emoji #{'js-user-authored' if user_authored} has-tooltip", data: { position: 'right' } do
+ = link_to '#', title: 'Add reaction', class: "note-action-button note-emoji-button js-add-award js-note-emoji #{'js-user-authored' if user_authored} has-tooltip", data: { position: 'right' } do
= icon('spinner spin')
%span{ class: 'link-highlight award-control-icon-neutral' }= custom_icon('emoji_slightly_smiling_face')
%span{ class: 'link-highlight award-control-icon-positive' }= custom_icon('emoji_smiley')