Commit 39754c6c authored by Didem Acet's avatar Didem Acet

Added colored labels to related MR list.

parent 891465ba
...@@ -55,9 +55,27 @@ ul.related-merge-requests > li { ...@@ -55,9 +55,27 @@ ul.related-merge-requests > li {
} }
.merge-request-status { .merge-request-status {
color: $gl-gray; font-size: 13px;
font-size: 15px; padding: 0px 5px;
font-weight: bold; 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, .merge-request,
......
...@@ -19,11 +19,17 @@ ...@@ -19,11 +19,17 @@
in in
- project = merge_request.target_project - project = merge_request.target_project
= link_to project.name_with_namespace, namespace_project_path(project.namespace, project) = link_to project.name_with_namespace, namespace_project_path(project.namespace, project)
%span.merge-request-status.prepend-left-10
- if merge_request.merged? - if merge_request.merged?
MERGED %span.merge-request-status.prepend-left-10.merged
Merged
- elsif merge_request.closed? - elsif merge_request.closed?
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? - if @closed_by_merge_requests.present?
%li %li
= render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count} = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}
---
title: Added colored labels to related MR list.
merge_request: 7486
author: Didem Acet
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment