diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-31 10:51:49 -0500 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2017-04-06 19:22:33 -0400 |
commit | 32e4a0f3513c846da376f70706d8d0ea60ba8b6e (patch) | |
tree | d047969b952f456e7f49b7776075d71137ae5e80 /app/views/projects/notes | |
parent | d2aea4cde0574b1dfbfc3d8d85ab80195fc29e3f (diff) | |
download | gitlab-ce-32e4a0f3513c846da376f70706d8d0ea60ba8b6e.tar.gz |
Add system notes icon helper; add icons
Diffstat (limited to 'app/views/projects/notes')
-rw-r--r-- | app/views/projects/notes/_note.html.haml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 18afa811bad..7d7a6a7387b 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -5,8 +5,13 @@ %li.timeline-entry{ id: dom_id(note), class: ["note", "note-row-#{note.id}", ('system-note' if note.system)], data: {author_id: note.author.id, editable: note_editable, note_id: note.id} } .timeline-entry-inner .timeline-icon - %a{ href: user_path(note.author) } - = image_tag avatar_icon(note.author), alt: '', class: 'avatar s40' + - if note.system + -# = render "#{note.system_note_metadata.action}.svg" + = icon_for_system_note(note) + %h1= note.system_note_metadata.action.inspect + - else + %a{ href: user_path(note.author) } + = image_tag avatar_icon(note.author), alt: '', class: 'avatar s40' .timeline-content .note-header %a.visible-xs{ href: user_path(note.author) } |