summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-05-10 22:15:03 -0500
committerEric Eastwood <contact@ericeastwood.com>2017-05-10 22:15:03 -0500
commit08edfb67b141b4f1b51fe624264c79dab3d2028e (patch)
treeda3f7896cff89b4923c8aebfaa4ca315c01856ff
parent1ccf101eef7db401317838a453795fa1c28ec036 (diff)
downloadgitlab-ce-08edfb67b141b4f1b51fe624264c79dab3d2028e.tar.gz
Fix flickering of system notes32087-fix-flickering-system-notes
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32087 Easy reproduction: 1. Edit an issue title 1. Notice the system note added 1. Switch to another tab and back (to fire the polling immediately) 1. Notice the flicker (without this fix)
-rw-r--r--app/views/shared/notes/_note.html.haml2
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?