diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-20 19:14:35 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-20 19:14:35 +0000 |
| commit | 681a3acf97196c1b7c567a5bbd02552a9ecf3115 (patch) | |
| tree | ad251901187f3721fe2fdd8109f822aa45df4adf /app/views/projects | |
| parent | d5bbc86094d2d1ecb851cd0982a10a6f6997b435 (diff) | |
| parent | 59b5bfff6d43b949f940cc8ea2b00b7de2cda274 (diff) | |
| download | gitlab-ce-681a3acf97196c1b7c567a5bbd02552a9ecf3115.tar.gz | |
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
Diffstat (limited to 'app/views/projects')
| -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') |