MR: merged badge. Removed colors from MR list

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

app/views/merge_requests/index.html.haml

@@ -6,19 +6,6 @@
 
 %br
 
-.mrs_legend
-  .list_legend
-    .icon.today
-    .text Today
-
-  .list_legend
-    .icon.merged
-    .text Merged
-
-  .list_legend
-    .icon.closed
-    .text Closed
-.clearfix
 
 .ui-box
   .title

app/views/merge_requests/show.html.haml

@@ -6,6 +6,11 @@
   %span.pretty_label.branch= @merge_request.target_branch
 
   %span.right
+    - if @merge_request.merged?
+      %span.btn.small.disabled.padded
+        %strong
+          %i.icon-ok
+          = "MERGED"
     - if can?(current_user, :modify_merge_request, @merge_request)
       - if @merge_request.open?
         = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded danger", :title => "Close merge request"