diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-03 18:26:37 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-03 18:26:37 +0000 |
| commit | 83fd03f2ddb6b2fb2088bb9b3945fe13afb91320 (patch) | |
| tree | 59afa9919901e626791352ec9662f147cfeffb4a /app | |
| parent | e46ec91a942fc0773279999debe661f493999500 (diff) | |
| parent | 198c2e40b08240f0102320d2f404583e40c1f0cd (diff) | |
| download | gitlab-ce-83fd03f2ddb6b2fb2088bb9b3945fe13afb91320.tar.gz | |
Merge branch 'closed-in-search' into 'master'
Fixed labels for closed issues/mr in search results
See merge request !941
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/search/results/_issue.html.haml | 2 | ||||
| -rw-r--r-- | 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 |