Merge branch 'ee-32087-fix-flickering-system-notes' into 'master'

Fix flickering of system notes -- EE merge edition

Closes gitlab-ce#32087

See merge request !1873

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?