Improve issue and merge request lists UI

1 files changed, 22 insertions, 17 deletions

diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index 1686ca0e876..be09f3a938d 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -1,18 +1,26 @@
 %li{ class: mr_css_classes(merge_request) }
   .merge-request-title
-    = link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.target_project, merge_request), class: "row_title"
-    - if merge_request.merged?
-      %small.pull-right
-        %i.fa.fa-check
-        MERGED
-    - else
-      %span.pull-right.hidden-xs
-        - if merge_request.for_fork?
-          %span.light
-            #{merge_request.source_project_namespace}:
-        = truncate merge_request.source_branch, length: 25
-        %i.fa.fa-angle-right.light
-        = merge_request.target_branch
+    %span.str-truncated
+      = link_to_gfm merge_request.title, project_merge_request_path(merge_request.target_project, merge_request), class: "row_title"
+    .pull-right
+      - if merge_request.merged?
+        %span
+          %i.fa.fa-check
+          MERGED
+      - elsif merge_request.closed?
+        %span
+          %i.fa.fa-close
+          CLOSED
+      - else
+        %span.hidden-xs.hidden-sm
+          %span.label-branch<
+            %i.fa.fa-code-fork
+            %span= merge_request.target_branch
+      - if merge_request.notes.any?
+        &nbsp;
+        %span
+          %i.fa.fa-comments
+          = merge_request.mr_and_commit_notes.count
   .merge-request-info
     %span.light= "##{merge_request.iid}"
     - if merge_request.assignee
@@ -21,10 +29,6 @@
       Unassigned
     - if merge_request.votes_count > 0
       = render 'votes/votes_inline', votable: merge_request
-    - if merge_request.notes.any?
-      %span
-        %i.fa.fa-comments
-        = merge_request.mr_and_commit_notes.count
     - if merge_request.milestone_id?
       %span
         %i.fa.fa-clock-o
@@ -33,6 +37,7 @@
       %span.task-status
         = merge_request.task_status
 
+
     .pull-right.hidden-xs
       %small updated #{time_ago_with_tooltip(merge_request.updated_at, 'bottom', 'merge_request_updated_ago')}