diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-01-22 14:45:36 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-01-22 14:45:36 +0000 |
| commit | db93069649a74859cf089847a1bcc7277ade95c9 (patch) | |
| tree | 431ee743e7457f6b5840a295714675eeae1f3264 | |
| parent | 8ff3db13991dc3dc4ee87e79607443672d93edad (diff) | |
| parent | 606147c32f318e88adb0ebf892026570ca5002cb (diff) | |
| download | gitlab-ce-db93069649a74859cf089847a1bcc7277ade95c9.tar.gz | |
Merge branch 'mr-widget-replace-body' into 'master'
Replace merge request widget body
See merge request !8697
| -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')); }); }; |