Merge branch '10860-stable-task-lists-wrap' into '9-1-stable'

Wrap MR content -stable branch

See merge request !10914

app/assets/stylesheets/pages/notes.scss

@@ -374,6 +374,15 @@ ul.notes {
   }
 }
 
+.note-headline-meta {
+  display: inline-block;
+  white-space: nowrap;
+
+  .system-note-message {
+    white-space: normal;
+  }
+}
+
 /**
  * Actions for Discussions/Notes
  */

app/views/projects/notes/_note.html.haml

@@ -12,12 +12,14 @@
           = image_tag avatar_icon(note.author), alt: '', class: 'avatar s40'
     .timeline-content
       .note-header
-        %a.visible-xs{ href: user_path(note.author) }
-          = note.author.to_reference
-        = link_to_member(note.project, note.author, avatar: false, extra_class: 'hidden-xs')
-        .note-headline-light
+        .note-header-info
+          %a{ href: user_path(note.author) }
             %span.hidden-xs
+              = sanitize(note.author.name)
+            %span.note-headline-light
               = note.author.to_reference
+          %span.note-headline-light
+            %span.note-headline-meta
               - unless note.system
                 commented
               - if note.system