diff options
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.coffee | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_check.html.haml | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index 3ba38766ae5..ca769e06a4e 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/app/assets/javascripts/merge_request_widget.js.coffee @@ -19,7 +19,7 @@ class @MergeRequestWidget when 'merged' location.reload() else - setTimeout(merge_request.mergeInProgress, 3000) + setTimeout(merge_request_widget.mergeInProgress, 3000) dataType: 'json' getMergeStatus: -> diff --git a/app/views/projects/merge_requests/widget/open/_check.html.haml b/app/views/projects/merge_requests/widget/open/_check.html.haml index 5ca2d37a979..e775447cb75 100644 --- a/app/views/projects/merge_requests/widget/open/_check.html.haml +++ b/app/views/projects/merge_requests/widget/open/_check.html.haml @@ -1,7 +1,6 @@ -%p - %strong - %i.fa.fa-spinner.fa-spin - Checking automatic merge… +%strong + %i.fa.fa-spinner.fa-spin + Checking automatic merge… :coffeescript $ -> |