From 198c2e40b08240f0102320d2f404583e40c1f0cd Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 3 Jul 2014 20:08:03 +0300 Subject: [PATCH] Fix labels showing if issue closed on search results page Signed-off-by: Dmitriy Zaporozhets --- app/views/search/results/_issue.html.haml | 2 +- app/views/search/results/_merge_request.html.haml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/search/results/_issue.html.haml b/app/views/search/results/_issue.html.haml index 7a24b76bced..8147cf272fb 100644 --- a/app/views/search/results/_issue.html.haml +++ b/app/views/search/results/_issue.html.haml @@ -6,4 +6,4 @@ = truncate issue.title, length: 50 %span.light (#{issue.project.name_with_namespace}) - if issue.closed? - %span.label Closed + %span.label.label-danger Closed diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml index 22d7587f6c1..de2a79970c1 100644 --- a/app/views/search/results/_merge_request.html.haml +++ b/app/views/search/results/_merge_request.html.haml @@ -8,5 +8,7 @@ %span.light (#{merge_request.source_project.name_with_namespace}:#{merge_request.source_branch} → #{merge_request.target_project.name_with_namespace}:#{merge_request.target_branch}) - else %span.light (#{merge_request.source_branch} → #{merge_request.target_branch}) - - if merge_request.closed? - %span.label Closed + - if merge_request.merged? + %span.label.label-primary Merged + - elsif merge_request.closed? + %span.label.label-danger Closed