From 39754c6c05671f3b7071d731171e1e1d78c5c480 Mon Sep 17 00:00:00 2001
From: Didem Acet <didemacet@gmail.com>
Date: Tue, 15 Nov 2016 21:00:14 +0200
Subject: Added colored labels to related MR list.

---
 app/assets/stylesheets/pages/issues.scss           | 24 +++++++++++++++++++---
 .../projects/issues/_merge_requests.html.haml      | 16 ++++++++++-----
 changelogs/unreleased/related-mr-labels.yml        |  4 ++++
 3 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 changelogs/unreleased/related-mr-labels.yml

diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index 3e7fc3fa52c..e9d43f33c2d 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -55,9 +55,27 @@ ul.related-merge-requests > li {
 }
 
 .merge-request-status {
-  color: $gl-gray;
-  font-size: 15px;
-  font-weight: bold;
+  font-size: 13px;
+  padding: 0px 5px;
+  color: #FFF;
+  height: 20px;
+  border-radius: 3px;
+  line-height: 18px;
+
+  &.merged {
+    border: 1px solid #2A96CC;
+    background: #2D9FD8;
+  }
+
+  &.closed {
+    border: 1px solid #C5254D;
+    background: #D62954;
+  }
+
+  &.open {
+    border: 1px solid #2EA65E;
+    background: #31AF64;
+  }
 }
 
 .merge-request,
diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml
index 31d3ec23276..747bfa554cb 100644
--- a/app/views/projects/issues/_merge_requests.html.haml
+++ b/app/views/projects/issues/_merge_requests.html.haml
@@ -19,11 +19,17 @@
             in
             - project = merge_request.target_project
             = link_to project.name_with_namespace, namespace_project_path(project.namespace, project)
-        %span.merge-request-status.prepend-left-10
-          - if merge_request.merged?
-            MERGED
-          - elsif merge_request.closed?
-            CLOSED
+
+        - if merge_request.merged?
+          %span.merge-request-status.prepend-left-10.merged
+            Merged
+        - elsif merge_request.closed?
+          %span.merge-request-status.prepend-left-10.closed
+            Closed
+        - else
+          %span.merge-request-status.prepend-left-10.open
+            Open
+
     - if @closed_by_merge_requests.present?
       %li
         = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}
diff --git a/changelogs/unreleased/related-mr-labels.yml b/changelogs/unreleased/related-mr-labels.yml
new file mode 100644
index 00000000000..268e0eab870
--- /dev/null
+++ b/changelogs/unreleased/related-mr-labels.yml
@@ -0,0 +1,4 @@
+---
+title: Added colored labels to related MR list.
+merge_request: 7486
+author: Didem Acet
-- 
cgit v1.2.1