Commit 5a7f15fbab05c571c568f75ab5fef4fe918494bd
1 parent
be0c6c27
Exists in
master
and in
4 other branches
Show label closed on search result
Showing
2 changed files
with
7 additions
and
1 deletions
Show diff stats
app/views/search/_result.html.haml
| ... | ... | @@ -30,6 +30,9 @@ |
| 30 | 30 | %span.light (#{merge_request.source_project.name_with_namespace}:#{merge_request.source_branch} → #{merge_request.target_project.name_with_namespace}:#{merge_request.target_branch}) |
| 31 | 31 | - else |
| 32 | 32 | %span.light (#{merge_request.source_branch} → #{merge_request.target_branch}) |
| 33 | + - if merge_request.closed? | |
| 34 | + %span.label Closed | |
| 35 | + | |
| 33 | 36 | - @issues.each do |issue| |
| 34 | 37 | %li |
| 35 | 38 | issue: |
| ... | ... | @@ -38,6 +41,9 @@ |
| 38 | 41 | %strong.term |
| 39 | 42 | = truncate issue.title, length: 50 |
| 40 | 43 | %span.light (#{issue.project.name_with_namespace}) |
| 44 | + - if issue.closed? | |
| 45 | + %span.label Closed | |
| 46 | + | |
| 41 | 47 | - @wiki_pages.each do |wiki_page| |
| 42 | 48 | %li |
| 43 | 49 | wiki: | ... | ... |
app/views/search/show.html.haml
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | = hidden_field_tag :project_id, params[:project_id] |
| 8 | 8 | = hidden_field_tag :group_id, params[:group_id] |
| 9 | 9 | = hidden_field_tag :search_code, params[:search_code] |
| 10 | - = submit_tag 'Search', class: "btn btn-primary wide" | |
| 10 | + = submit_tag 'Search', class: "btn btn-create" | |
| 11 | 11 | .prepend-top-10 |
| 12 | 12 | = render 'filter', f: f |
| 13 | 13 | ... | ... |