diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-20 14:50:16 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-04-21 09:44:17 +0000 |
commit | 808038be36289ef20f3e2ae8f0e79df32b96df6e (patch) | |
tree | f4c77e351aec3fab7bb9286a7321e7d8d897a3c1 | |
parent | 316a6b3ba14a5e4d490318045d0e67093cb65ca9 (diff) | |
download | gitlab-ce-808038be36289ef20f3e2ae8f0e79df32b96df6e.tar.gz |
Merge branch 'system-note-commented' into 'master'
Removed commented text from system notes
![Screen_Shot_2016-04-20_at_14.49.22](/uploads/b1617af49cc35595afd6dfcf761a775c/Screen_Shot_2016-04-20_at_14.49.22.png)
See merge request !3836
-rw-r--r-- | app/views/projects/notes/_note.html.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 6e9ecdf7649..aeb7c1d5ee4 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -8,7 +8,9 @@ .note-header = link_to_member(note.project, note.author, avatar: false) .inline.note-headline-light - = "#{note.author.to_reference} commented" + = "#{note.author.to_reference}" + - if !note.system + commented %a{ href: "##{dom_id(note)}" } = time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago') .note-actions |