Commit 15cfa5ca authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix automerge

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 946b4ced
...@@ -19,7 +19,7 @@ class @MergeRequestWidget ...@@ -19,7 +19,7 @@ class @MergeRequestWidget
when 'merged' when 'merged'
location.reload() location.reload()
else else
setTimeout(merge_request.mergeInProgress, 3000) setTimeout(merge_request_widget.mergeInProgress, 3000)
dataType: 'json' dataType: 'json'
getMergeStatus: -> getMergeStatus: ->
......
%p %strong
%strong
%i.fa.fa-spinner.fa-spin %i.fa.fa-spinner.fa-spin
Checking automatic merge… Checking automatic merge…
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment