Fix automerge
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
946b4ceda3
commit
15cfa5ca20
|
@ -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: ->
|
||||
|
|
|
@ -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
|
||||
$ ->
|
||||
|
|
Loading…
Reference in New Issue