kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix automerge 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2015-06-11 18:49:34 +02:00
parent 946b4ceda3
commit 15cfa5ca20
No known key found for this signature in database
GPG Key ID: 627C5F589F467F17
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/merge_request_widget.js.coffee
View File

@ -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: ->

7
app/views/projects/merge_requests/widget/open/_check.html.haml
View File

@ -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
$ ->