summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/automerge.js.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/projects/merge_requests/automerge.js.haml')
-rw-r--r--app/views/projects/merge_requests/automerge.js.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/automerge.js.haml b/app/views/projects/merge_requests/automerge.js.haml
index 26db408a576..33321651e32 100644
--- a/app/views/projects/merge_requests/automerge.js.haml
+++ b/app/views/projects/merge_requests/automerge.js.haml
@@ -1,6 +1,6 @@
- if @status
:plain
- merge_request.getMergeStatus();
+ merge_request_widget.mergeInProgress();
- else
:plain
$('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/reload'))}");