Converted merge_requests.js to coffeescript and updated code

2013-01-05 02:18:39 +01:00 · 2013-01-05 02:18:39 +01:00 · a1566a9c86
commit a1566a9c86
parent 0a94640e32
13 changed files with 142 additions and 183 deletions
--- a/app/views/merge_requests/automerge.js.haml
+++ b/app/views/merge_requests/automerge.js.haml
@ -3,5 +3,5 @@
    location.reload();
 -else
  :plain
-    MergeRequest.already_cannot_be_merged()
+    merge_request.alreadyOrCannotBeMerged()