diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-11 07:57:38 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-11 07:57:38 +0000 |
| commit | 4067dd4f84681dd109fb8e1957b6327b4db20193 (patch) | |
| tree | 372c45d197259b5090ea6933a7c981870ac26047 | |
| parent | 226f3bb94fcd21911a4978621fe2d4cc369358c3 (diff) | |
| parent | 08edfb67b141b4f1b51fe624264c79dab3d2028e (diff) | |
| download | gitlab-ce-4067dd4f84681dd109fb8e1957b6327b4db20193.tar.gz | |
Merge branch '32087-fix-flickering-system-notes' into 'master'
Fix flickering of system notes
Closes #32087
See merge request !11281
| -rw-r--r-- | app/views/shared/notes/_note.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/shared/notes/_note.html.haml b/app/views/shared/notes/_note.html.haml index 5c1156b06fb..87aae793966 100644 --- a/app/views/shared/notes/_note.html.haml +++ b/app/views/shared/notes/_note.html.haml @@ -29,6 +29,8 @@ - if note.system %span.system-note-message = note.redacted_note_html + .original-note-content.hidden + = note.note %a{ href: "##{dom_id(note)}" } = time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago') - unless note.system? |