Auto-merge: 'already can not be merged' alert

2012-04-16 23:05:08 +03:00 · 2012-04-16 23:05:08 +03:00 · a8e4f3ed88
commit a8e4f3ed88
parent 8269a3a735
4 changed files with 25 additions and 5 deletions
--- a/app/views/merge_requests/automerge.js.haml
+++ b/app/views/merge_requests/automerge.js.haml
@ -1,2 +1,7 @@
-:plain
-  location.reload();
+-if @status
+  :plain
+    location.reload();
+-else
+  :plain
+    MergeRequest.already_cannot_be_merged()
+
--- a/app/views/merge_requests/show.html.haml
+++ b/app/views/merge_requests/show.html.haml
@ -71,6 +71,11 @@
    .alert-message
      %p
        %strong Checking for ability to automatically merge… 
+  
+  .automerge_widget.already_cannot_be_merged{:style => "display:none"}
+    .alert-message
+      %p
+        %strong This merge request already can not be merged