Commit 83fd03f2 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'closed-in-search' into 'master'

Fixed labels for closed issues/mr in search results

See merge request !941
parents e46ec91a 198c2e40
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
= truncate issue.title, length: 50 = truncate issue.title, length: 50
%span.light (#{issue.project.name_with_namespace}) %span.light (#{issue.project.name_with_namespace})
- if issue.closed? - if issue.closed?
%span.label Closed %span.label.label-danger Closed
...@@ -8,5 +8,7 @@ ...@@ -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}) %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 - else
%span.light (#{merge_request.source_branch} → #{merge_request.target_branch}) %span.light (#{merge_request.source_branch} → #{merge_request.target_branch})
- if merge_request.closed? - if merge_request.merged?
%span.label Closed %span.label.label-primary Merged
- elsif merge_request.closed?
%span.label.label-danger Closed
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