From 46b5f83a1b482bc92ab2985d70d8ab07551b75e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= <rdavila84@gmail.com>
Date: Wed, 27 Jan 2016 11:45:51 -0500
Subject: [PATCH] Show labels in Issues tab.
---
app/assets/stylesheets/pages/milestone.scss | 12 ++++++++++++
app/views/projects/milestones/_issue.html.haml | 4 +++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss
index 8772de5f1fe..bb246dc90c8 100644
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -15,3 +15,15 @@ li.milestone {
.time-elapsed {
color: #F14539;
}
+
+.issue-row .assignee-icon {
+ .color-label {
+ float: left;
+ padding: 8px;
+ margin-left: 10px;
+ }
+
+ img {
+ margin-left: 8px;
+ }
+}
diff --git a/app/views/projects/milestones/_issue.html.haml b/app/views/projects/milestones/_issue.html.haml
index 133d802aaca..599fb7ef5aa 100644
--- a/app/views/projects/milestones/_issue.html.haml
+++ b/app/views/projects/milestones/_issue.html.haml
@@ -1,7 +1,9 @@
%li{ id: dom_id(issue, 'sortable'), class: 'issue-row', 'data-iid' => issue.iid, 'data-url' => issue_path(issue) }
.pull-right.assignee-icon
+ - issue.labels.each do |label|
+ = render_colored_label(label)
- if issue.assignee
- = image_tag avatar_icon(issue.assignee, 16), class: "avatar s16", alt: ''
+ = image_tag avatar_icon(issue.assignee, 16), class: "avatar s24", alt: ''
%span
= link_to [@project.namespace.becomes(Namespace), @project, issue] do
%span.cgray ##{issue.iid}
--
GitLab