Auto-merge: checking via AJAX

app/views/merge_requests/show.html.haml

@@ -54,18 +54,25 @@
 
 
 - if @merge_request.open? && @commits.any? && can?(current_user, :accept_mr, @project)
-  - if @merge_request.can_be_merged?
+  .automerge_widget.can_be_merged{:style => "display:none"}
     .ui-box.padded
       %p 
         You can accept this request automatically. If you still want to do it manually - #{link_to "click here", "#", :class => "how_to_merge_link vlink", :title => "How To Merge"} for instructions
       = link_to "Accept Merge Request", automerge_project_merge_request_path(@project, @merge_request), :class => "btn small info accept_merge_request", :remote => true
        
-        
-  - else
+      
+  .automerge_widget.cannot_be_merged{:style => "display:none"}
     .alert-message
       %p
         %strong This request cant be merged with GitLab. You should do it manually  
         = link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge"
+  
+  .automerge_widget.unchecked
+    .alert-message
+      %p
+        %strong Checking for ability to automatically merge… 
+
+
 
 
 = render "merge_requests/commits"
@@ -87,7 +94,9 @@
 
 :javascript
   $(function(){
-    MergeRequest.init();
+    MergeRequest.init({
+      url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
+    });
 
     $(".accept_merge_request").live("ajax:beforeSend", function() {
       $(this).replaceWith('#{image_tag "ajax_loader.gif"}');