Replace merge request widget body

606147c3 · Phil Hughes · 125abfd4 · 606147c3
Commit 606147c3 authored Jan 22, 2017 by Phil Hughes
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'));
      });
    };