summaryrefslogtreecommitdiff
path: root/app/views/shared/notes
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2019-03-11 22:19:52 +0900
committerTakuya Noguchi <takninnovationresearch@gmail.com>2019-03-12 03:01:07 +0900
commit0ef80ccc5d1cc4e342894c19c956366f9e0c4460 (patch)
tree678db1a7aafd891a9fce933722e7eca820caa119 /app/views/shared/notes
parent5dd2e065977998649428f6ccd0bd0418d57fd296 (diff)
downloadgitlab-ce-0ef80ccc5d1cc4e342894c19c956366f9e0c4460.tar.gz
Keep inline as much as possible in system notes on issuable
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
Diffstat (limited to 'app/views/shared/notes')
-rw-r--r--app/views/shared/notes/_note.html.haml15
1 files changed, 7 insertions, 8 deletions
diff --git a/app/views/shared/notes/_note.html.haml b/app/views/shared/notes/_note.html.haml
index 41d6ae79c81..6fec435cc87 100644
--- a/app/views/shared/notes/_note.html.haml
+++ b/app/views/shared/notes/_note.html.haml
@@ -36,14 +36,13 @@
= user_status(note.author)
%span.note-headline-light
= note.author.to_reference
- %span.note-headline-light
- %span.note-headline-meta
- - if note.system
- %span.system-note-message
- = markdown_field(note, :note)
- %span.system-note-separator
- &middot;
- %a.system-note-separator{ href: "##{dom_id(note)}" }= time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago')
+ %span.note-headline-light.note-headline-meta
+ - if note.system
+ %span.system-note-message
+ = markdown_field(note, :note)
+ %span.system-note-separator
+ &middot;
+ %a.system-note-separator{ href: "##{dom_id(note)}" }= time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago')
- unless note.system?
.note-actions
- if note.for_personal_snippet?