Commit 762c8a98 authored by Jacob Schatz's avatar Jacob Schatz Committed by Robert Speicher

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
parent 605e1229
......@@ -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')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment