Download as
Browse Code »

Commit 5a7f15fbab05c571c568f75ab5fef4fe918494bd

Authored by Dmitriy Zaporozhets
1 parent be0c6c27
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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
  Diff comments   View file @5a7f15f
@@ -30,6 +30,9 @@ @@ -30,6 +30,9 @@
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}) 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 - else 31 - else
32 %span.light (#{merge_request.source_branch} → #{merge_request.target_branch}) 32 %span.light (#{merge_request.source_branch} → #{merge_request.target_branch})
  33 + - if merge_request.closed?
  34 + %span.label Closed
  35 +
33 - @issues.each do |issue| 36 - @issues.each do |issue|
34 %li 37 %li
35 issue: 38 issue:
@@ -38,6 +41,9 @@ @@ -38,6 +41,9 @@
38 %strong.term 41 %strong.term
39 = truncate issue.title, length: 50 42 = truncate issue.title, length: 50
40 %span.light (#{issue.project.name_with_namespace}) 43 %span.light (#{issue.project.name_with_namespace})
  44 + - if issue.closed?
  45 + %span.label Closed
  46 +
41 - @wiki_pages.each do |wiki_page| 47 - @wiki_pages.each do |wiki_page|
42 %li 48 %li
43 wiki: 49 wiki:
app/views/search/show.html.haml
  Diff comments   View file @5a7f15f
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 = hidden_field_tag :project_id, params[:project_id] 7 = hidden_field_tag :project_id, params[:project_id]
8 = hidden_field_tag :group_id, params[:group_id] 8 = hidden_field_tag :group_id, params[:group_id]
9 = hidden_field_tag :search_code, params[:search_code] 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 .prepend-top-10 11 .prepend-top-10
12 = render 'filter', f: f 12 = render 'filter', f: f
13 13