Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 13 deletions

diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml
index 477f6c73388..224930e28df 100644
--- a/app/views/discussions/_discussion.html.haml
+++ b/app/views/discussions/_discussion.html.haml
@@ -3,19 +3,13 @@
   .timeline-entry-inner
     .timeline-content
       .discussion.js-toggle-container{ data: { discussion_id: discussion.id, is_expanded: expanded.to_s } }
-        .discussion-header
-          .timeline-icon
+        .discussion-header.gl-display-flex.gl--flex-center
+          .timeline-icon.gl-flex-shrink-0
             = link_to user_path(discussion.author) do
-              = image_tag avatar_icon_for_user(discussion.author), class: "avatar s40"
-          .discussion-actions
-            %button.note-action-button.discussion-toggle-button.js-toggle-button{ type: "button", class: ("js-toggle-lazy-diff" unless expanded) }
-              = sprite_icon('chevron-up', css_class: "js-sidebar-collapse #{'hidden' unless expanded}")
-              = sprite_icon('chevron-down', css_class: "js-sidebar-expand #{'hidden' if expanded}")
-              %span.js-sidebar-collapse{ class: "#{'hidden' unless expanded}" }= _('Hide thread')
-              %span.js-sidebar-expand{ class: "#{'hidden' if expanded}" }= _('Show thread')
+              = render Pajamas::AvatarComponent.new(discussion.author, size: 32, class: 'gl-mr-3')
           = link_to_member(@project, discussion.author, avatar: false)
 
-          .inline.discussion-headline-light
+          .inline.discussion-headline-light.gl-mx-3
             = discussion.author.to_reference
             started a thread
 
@@ -42,10 +36,16 @@
                     an old version of
                   the diff
 
-
             = time_ago_with_tooltip(discussion.created_at, placement: "bottom", html_class: "note-created-ago")
           = render "discussions/headline", discussion: discussion
 
+          .discussion-actions.gl-ml-auto
+            %button.note-action-button.discussion-toggle-button.js-toggle-button{ type: "button", class: ("js-toggle-lazy-diff" unless expanded) }
+              = sprite_icon('chevron-up', css_class: "js-sidebar-collapse #{'hidden' unless expanded}")
+              = sprite_icon('chevron-down', css_class: "js-sidebar-expand #{'hidden' if expanded}")
+              %span.js-sidebar-collapse{ class: "#{'hidden' unless expanded}" }= _('Hide thread')
+              %span.js-sidebar-expand{ class: "#{'hidden' if expanded}" }= _('Show thread')
+
         .discussion-body.js-toggle-content{ class: ("hide" unless expanded) }
           - if discussion.diff_discussion? && discussion.diff_file
             = render "discussions/diff_with_notes", discussion: discussion
diff --git a/app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml b/app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml
index 840635ca39a..478db70877d 100644
--- a/app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml
+++ b/app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml
@@ -1,8 +1,7 @@
 - display_issuable_type = issuable_display_type(@merge_request)
 
 .float-left.btn-group.gl-md-ml-3.gl-display-flex.dropdown.gl-new-dropdown.gl-md-w-auto.gl-w-full
-  = button_tag type: 'button', class: "btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle btn-default-tertiary dropdown-icon-only dropdown-toggle-no-caret gl-display-none! gl-md-display-inline-flex!", data: { 'toggle' => 'dropdown' } do
-    %span.gl-sr-only= _('Toggle dropdown')
+  = button_tag type: 'button', class: "btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle btn-default-tertiary dropdown-icon-only dropdown-toggle-no-caret has-tooltip gl-display-none! gl-md-display-inline-flex!", data: { toggle: 'dropdown', title: _('Merge request actions'), testid: 'merge-request-actions' } do
     = sprite_icon "ellipsis_v", size: 16, css_class: "dropdown-icon gl-icon"
   = button_tag type: 'button', class: "btn dropdown-toggle btn-default btn-md btn-block gl-button gl-dropdown-toggle gl-md-display-none!", data: { 'toggle' => 'dropdown' } do
     %span.gl-new-dropdown-button-text= _('Merge request actions')