diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-20 22:14:35 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-21 18:52:25 +0300 |
| commit | 762c8a986b9f3f43caf1ef2db65d941e48bcb73b (patch) | |
| tree | 63da7d7581ec4ac2dc490d777853d631da1168cd | |
| parent | 605e122952e7c5595b2e977d29c03dc70930a848 (diff) | |
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)
See merge request !4629
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 4 |
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..c04d291412c 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') |