summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-06-13 16:13:16 +0100
committerPhil Hughes <me@iamphill.com>2016-06-13 16:13:16 +0100
commitad57a94a092d8b8326c1bbd854ea49c1cd9f5743 (patch)
tree8c7daa69e49614c1631a0034974f2e91ae7ff3c7
parent9fdadfc065d52926d7fdd0f675c6f5335044aa22 (diff)
downloadgitlab-ce-ad57a94a092d8b8326c1bbd854ea49c1cd9f5743.tar.gz
Hides award emoji & access level on system notes
-rw-r--r--app/views/projects/notes/_note.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index bcdbff08011..57050a87d40 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -18,9 +18,9 @@
= time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago')
.note-actions
- access = note.project.team.human_max_access(note.author.id)
- - if access
+ - if access and !note.system
%span.note-role.hidden-xs= access
- - if current_user
+ - if current_user and !note.system
= 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')