MR: merged badge. Removed colors from MR list

2012-06-26 19:08:44 +03:00 · 2012-06-26 19:08:44 +03:00 · 0321a3c9b4
commit 0321a3c9b4
parent 89d3366e76
10 changed files with 28 additions and 25 deletions
--- a/app/views/merge_requests/_merge_request.html.haml
+++ b/app/views/merge_requests/_merge_request.html.haml
@ -1,8 +1,11 @@
 %li.wll{ :class => mr_css_classes(merge_request) }
-  .list_legend
-    .icon
  .right
    .left
+      - if merge_request.merged?
+        %span.btn.small.disabled.padded
+          %strong
+            %i.icon-ok
+            = "MERGED"
      - if merge_request.notes.any?
        %span.btn.small.disabled.padded= pluralize merge_request.notes.count, 'note'
      %span.btn.small.disabled.padded