diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-07 01:31:08 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-07 01:31:08 +0000 |
| commit | 558cdc9f2fbd1ce87da396cea93c4a814227b36a (patch) | |
| tree | d6d213b06fe70f92fdeaf4a29fbc4254a99c4169 /app/views/projects/notes | |
| parent | 496208c9bdfcdad685183afa36ad2173357c18da (diff) | |
| parent | 31672df34e673a0eba6aa61bf5de6939d210b397 (diff) | |
| download | gitlab-ce-558cdc9f2fbd1ce87da396cea93c4a814227b36a.tar.gz | |
Merge branch '24784-mr-system-notes' into 'master'
View helpful system note in comment threads
Closes #24784
See merge request !10503
Diffstat (limited to 'app/views/projects/notes')
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 18afa811bad..9130dc128fa 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -5,8 +5,11 @@ %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 + = icon_for_system_note(note) + - 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) } |