kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Fixed labels for closed issues/mr in search results

See merge request !941
This commit is contained in:
Dmitriy Zaporozhets 2014-07-03 18:26:37 +00:00
parent e46ec91a94 198c2e40b0
commit 83fd03f2dd
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/search/results/_issue.html.haml
View File

@ -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

6
app/views/search/results/_merge_request.html.haml
View File

@ -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