diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-01-22 17:04:06 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-01-22 17:04:06 +0000 |
| commit | 352ea0aeda4523c00feb56f9d6bae97a6f5ebedd (patch) | |
| tree | 9ac6674892f099e8b843c1ffa9a92d6d17c558b6 | |
| parent | 084ac867773ff2bc8be9a196b356fa7116c66a75 (diff) | |
| parent | 22f69a4f1c6a24d961b6c09d57c64a30b0190f80 (diff) | |
| download | gitlab-ce-352ea0aeda4523c00feb56f9d6bae97a6f5ebedd.tar.gz | |
Merge branch 'mr-widget-reload-fix' into 'master'
Merge request widget class names update
See merge request !8700
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.es6 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.es6 b/app/assets/javascripts/merge_request_widget.js.es6 index b069379115b..7cc319e2f4e 100644 --- a/app/assets/javascripts/merge_request_widget.js.es6 +++ b/app/assets/javascripts/merge_request_widget.js.es6 @@ -127,8 +127,8 @@ MergeRequestWidget.prototype.getMergeStatus = function() { return $.get(this.opts.merge_check_url, function(data) { var $html = $(data); - $('.mr-state-body').replaceWith($html.find('.mr-state-body')); - $('.mr-state-footer').replaceWith($html.find('.mr-state-footer')); + $('.mr-widget-body').replaceWith($html.find('.mr-widget-body')); + $('.mr-widget-footer').replaceWith($html.find('.mr-widget-footer')); }); }; |