From c75a512464bc679d978fe8505246d7f3cb3c83a5 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Sun, 22 Jan 2017 14:24:02 +0000 Subject: [PATCH] Merge request widget replace body & footer --- app/assets/javascripts/merge_request_widget.js.es6 | 4 +++- app/views/projects/merge_requests/widget/_open.html.haml | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/merge_request_widget.js.es6 b/app/assets/javascripts/merge_request_widget.js.es6 index 961c85b5c263ab..1ad709d20f9c3b 100644 --- a/app/assets/javascripts/merge_request_widget.js.es6 +++ b/app/assets/javascripts/merge_request_widget.js.es6 @@ -143,7 +143,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:not(.mr-approvals-footer)').replaceWith($html.find('.mr-state-footer:not(.mr-approvals-footer)')); }); }; diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml index a2127549a903b1..6eb4eeab9fdf4c 100644 --- a/app/views/projects/merge_requests/widget/_open.html.haml +++ b/app/views/projects/merge_requests/widget/_open.html.haml @@ -56,11 +56,9 @@ #{mr_issues_mentioned_but_not_closing.size > 1 ? 'are' : 'is'} mentioned but will not be closed. - if @merge_request.requires_approve? - .mr-widget-footer{ 'v-show' => '!showApprovals' } + .mr-widget-footer.mr-approvals-footer{ 'v-show' => '!showApprovals' } = icon("spinner spin") Checking approval status for this merge request. .approvals-components{ 'v-show' => 'showApprovals' } = render 'projects/merge_requests/widget/open/approvals_body' = render 'projects/merge_requests/widget/open/approvals_footer' - - -- GitLab