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/events | |
| 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/events')
| -rw-r--r-- | app/views/events/event/_common.html.haml | 2 | ||||
| -rw-r--r-- | app/views/events/event/_note.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml index 2a98e58a03a..c0c11d00519 100644 --- a/app/views/events/event/_common.html.haml +++ b/app/views/events/event/_common.html.haml @@ -7,7 +7,7 @@ = custom_icon("icon_status_closed") - else .profile-icon.fork-icon - = custom_icon("code_fork") + = custom_icon("icon_code_fork") .event-title %span{ class: event.action_name } diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml index 603bed6d705..cbcfe0ff71f 100644 --- a/app/views/events/event/_note.html.haml +++ b/app/views/events/event/_note.html.haml @@ -1,5 +1,5 @@ .profile-icon - = custom_icon("comment_o") + = custom_icon("icon_comment_o") .event-title = event.action_name |