mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-13 14:46:05 +10:00
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
This commit is contained in:
committed by
Robert Speicher
parent
605e122952
commit
762c8a986b
@@ -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')
|
||||
|
||||
Reference in New Issue
Block a user