diff options
| author | Phil Hughes <me@iamphill.com> | 2017-01-22 12:38:53 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-01-22 12:40:34 +0000 |
| commit | 606147c32f318e88adb0ebf892026570ca5002cb (patch) | |
| tree | 9dcfb3c94cc49357d77df9424da6d9cb2785b2e1 | |
| parent | 125abfd4b2c72dd2b1b81cef259cb1004a8db800 (diff) | |
| download | gitlab-ce-606147c32f318e88adb0ebf892026570ca5002cb.tar.gz | |
Replace merge request widget bodymr-widget-replace-body
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.es6 | 4 |
1 files changed, 3 insertions, 1 deletions
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')); }); }; |