From 762c8a986b9f3f43caf1ef2db65d941e48bcb73b Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Mon, 20 Jun 2016 19:14:35 +0000 Subject: [PATCH] Merge branch 'note-emoji-system-note' into 'master' Hides award emoji & access level on system notes ## What does this MR do? Hides award emoji & access level on system notes as they aren't applicable to them notes. ## Screenshots (if relevant) ![Screen_Shot_2016-06-13_at_16.14.03](/uploads/c105c37d0f140dea7480b56242c14ed9/Screen_Shot_2016-06-13_at_16.14.03.png) See merge request !4629 --- app/views/projects/notes/_note.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index bcdbff0801..c04d291412 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 not note.system %span.note-role.hidden-xs= access - - if current_user + - if current_user and not 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')