diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-20 14:50:16 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-20 14:50:16 +0000 |
| commit | 1ec203a98f9065b885dba539e6dd8e9548cf7fc6 (patch) | |
| tree | e321fe6d179ae7326c10ef57bb053e7d814a9375 | |
| parent | 8cb3bf326a0908364502131888ebd7718ead6063 (diff) | |
| parent | 04c992f3cf39acf8ae183de0c934b5824d7a1737 (diff) | |
| download | gitlab-ce-1ec203a98f9065b885dba539e6dd8e9548cf7fc6.tar.gz | |
Merge branch 'system-note-commented' into 'master'
Removed commented text from system notes
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 |