Commit 808038be authored by Jacob Schatz's avatar Jacob Schatz Committed by Yorick Peterse

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
parent 316a6b3b
...@@ -8,7 +8,9 @@ ...@@ -8,7 +8,9 @@
.note-header .note-header
= link_to_member(note.project, note.author, avatar: false) = link_to_member(note.project, note.author, avatar: false)
.inline.note-headline-light .inline.note-headline-light
= "#{note.author.to_reference} commented" = "#{note.author.to_reference}"
- if !note.system
commented
%a{ href: "##{dom_id(note)}" } %a{ href: "##{dom_id(note)}" }
= time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago') = time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago')
.note-actions .note-actions
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment