Fix automerge

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix automerge
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
15cfa5ca · Dmitriy Zaporozhets · 946b4ced · 15cfa5ca · 15cfa5ca
Commit 15cfa5ca authored Jun 11, 2015 by Dmitriy Zaporozhets
2 changed files
--- 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: ->

--- a/app/views/projects/merge_requests/widget/open/_check.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_check.html.haml
-%p
+%strong
-  %strong
+  %i.fa.fa-spinner.fa-spin
-    %i.fa.fa-spinner.fa-spin
+  Checking automatic merge…
-    Checking automatic merge…
 :coffeescript
  $ ->