summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-06-08 17:09:48 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-06-08 17:09:48 -0600
commitbdc995bf00794f96af46d92f61a940896c1404d0 (patch)
tree5b9b370b61632a4b0034ec257b5dd475daacbb04
parent0001a0cf9dfd7217639ce82648d1908926a8e874 (diff)
downloadgitlab-ce-bdc995bf00794f96af46d92f61a940896c1404d0.tar.gz
Shows award emoji for comments to all users who are logged in.
-rw-r--r--app/views/projects/notes/_note.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 5ddd0ecc4c1..bcdbff08011 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -20,10 +20,11 @@
- access = note.project.team.human_max_access(note.author.id)
- if access
%span.note-role.hidden-xs= access
- - if note_editable
+ - if current_user
= link_to '#', title: 'Award Emoji', class: 'note-action-button note-emoji-button js-add-award js-note-emoji', data: { position: 'right' } do
= icon('spinner spin')
= icon('smile-o')
+ - if note_editable
= link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do
= icon('pencil')
= link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button hidden-xs js-note-delete danger' do