Merge branch 'mr-widget-fix' into 'master'

Fixed incorrect class names used in merge request widget

See merge request !1093

app/assets/javascripts/merge_request_widget.js.es6

@@ -143,7 +143,9 @@
 
     MergeRequestWidget.prototype.getMergeStatus = function() {
       return $.get(this.opts.merge_check_url, function(data) {
-        return $('.mr-state-widget').replaceWith(data);
+        var $html = $(data);
+        $('.mr-widget-body').replaceWith($html.find('.mr-widget-body'));
+        $('.mr-widget-footer:not(.mr-approvals-footer)').replaceWith($html.find('.mr-widget-footer:not(.mr-approvals-footer)'));
       });
     };
 

app/assets/javascripts/merge_request_widget/approvals/components/approvals_body.js.es6

@@ -76,7 +76,7 @@
       gl.ApprovalsStore.initStoreOnce();
     },
     template: `
-      <div class='approvals-body mr-widget-footer'>
+      <div class='approvals-body mr-widget-footer mr-approvals-footer'>
         <h4> Requires {{ approvalsRequiredStringified }}
           <span v-if='showSuggestedApprovers'> (from {{ approverNamesStringified }}) </span>
         </h4>

app/assets/javascripts/merge_request_widget/approvals/components/approvals_footer.js.es6

@@ -57,7 +57,7 @@
       gl.ApprovalsStore.initStoreOnce();
     },
     template: `
-      <div class='mr-widget-footer approved-by-users approvals-footer clearfix'>
+      <div class='mr-widget-footer approved-by-users approvals-footer clearfix mr-approvals-footer'>
         <span class='approvers-prefix'> Approved by </span>
         <span v-for='approver in approvedBy'>
           <link-to-member-avatar
@@ -90,4 +90,3 @@
     `,
   });
 })();
-

app/views/projects/merge_requests/widget/_open.html.haml

@@ -56,11 +56,9 @@
           #{mr_issues_mentioned_but_not_closing.size > 1 ? 'are' : 'is'} mentioned but will not be closed.
 
   - if @merge_request.requires_approve?
-    .mr-widget-footer{ 'v-show' => '!showApprovals' }
+    .mr-widget-footer.mr-approvals-footer{ 'v-show' => '!showApprovals' }
       = icon("spinner spin")
       Checking approval status for this merge request.
     .approvals-components{ 'v-show' => 'showApprovals' }
       = render 'projects/merge_requests/widget/open/approvals_body'
       = render 'projects/merge_requests/widget/open/approvals_footer'
-
-