Merge CE/master into EE/master

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

@@ -9,9 +9,12 @@
         = image_tag avatar_icon(note.author), alt: '', class: 'avatar s40'
     .timeline-content
       .note-header
-        = link_to_member(note.project, note.author, avatar: false)
-        .note-headline-light
+        %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
+          %span.hidden-xs
+            = note.author.to_reference
           - unless note.system
             commented
           - if note.system
@@ -23,7 +26,7 @@
           .note-actions
             - access = note_max_access_for_user(note)
             - if access
-              %span.note-role.hidden-xs= access
+              %span.note-role= access
 
             - if note.resolvable?
               - can_resolve = can?(current_user, :resolve_note, note)
@@ -59,7 +62,7 @@
               - if note_editable
                 = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do
                   = icon('pencil', class: 'link-highlight')
-                = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button hidden-xs js-note-delete danger' do
+                = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete danger' do
                   = icon('trash-o', class: 'danger-highlight')
       .note-body{ class: note_editable ? 'js-task-list-container' : '' }
         .note-text.md

changelogs/unreleased/25134-mobile-issue-view-doesn-t-show-organization-membership.yml

+---
+title: Show organisation membership and delete comment on smaller viewports, plus change comment author name to username
+merge_request:
+author:

spec/javascripts/test_bundle.js

@@ -34,7 +34,11 @@ testsContext.keys().forEach(function (path) {
   try {
     testsContext(path);
   } catch (err) {
-    console.error('[ERROR] WITH SPEC FILE: ', path);
-    console.error(err);
+    console.error('[ERROR] Unable to load spec: ', path);
+    describe('Test bundle', function () {
+      it(`includes '${path}'`, function () {
+        expect(err).toBeNull();
+      });
+    });
   }
 });