diff options
Diffstat (limited to 'app/views/projects/merge_requests/automerge.js.haml')
| -rw-r--r-- | app/views/projects/merge_requests/automerge.js.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/merge_requests/automerge.js.haml b/app/views/projects/merge_requests/automerge.js.haml index a53cbb150a4..26db408a576 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 +- if @status :plain - merge_request.mergeInProgress(); --else + merge_request.getMergeStatus(); +- else :plain - merge_request.alreadyOrCannotBeMerged() + $('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/reload'))}"); |