From 606147c32f318e88adb0ebf892026570ca5002cb Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Sun, 22 Jan 2017 12:38:53 +0000
Subject: Replace merge request widget body

---
 app/assets/javascripts/merge_request_widget.js.es6 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/merge_request_widget.js.es6 b/app/assets/javascripts/merge_request_widget.js.es6
index 7a315e43667..b069379115b 100644
--- 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'));
       });
     };
 
-- 
cgit v1.2.3