Merge branch 'mr-widget-replace-body' into 'master'

Replace merge request widget body See merge request !8697

Merge branch 'mr-widget-replace-body' into 'master'
Replace merge request widget body See merge request !8697
db930696 · Jacob Schatz · 8ff3db13 · 606147c3 · db930696
Commit db930696 authored Jan 22, 2017 by Jacob Schatz
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

app/assets/javascripts/merge_request_widget.js.es6 app/assets/javascripts/merge_request_widget.js.es6 +3 -1

No files found.
--- a/app/assets/javascripts/merge_request_widget.js.es6
+++ b/app/assets/javascripts/merge_request_widget.js.es6
@@ -126,7 +126,9 @@
    MergeRequestWidget.prototype.getMergeStatus = function() {
      return $.get(this.opts.merge_check_url, function(data) {
-        return $('.mr-state-widget').replaceWith(data);
+        var $html = $(data);
+        $('.mr-state-body').replaceWith($html.find('.mr-state-body'));
+        $('.mr-state-footer').replaceWith($html.find('.mr-state-footer'));
      });
    };