Download as
Browse Code »

Commit a43a38039476598fe1e959b29d7033a5b1b1c8d0

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

Increase amount of search results for issues, mr, projects

Showing 3 changed files with 3 additions and 5 deletions   Show diff stats
app/contexts/search_context.rb
  Diff comments   View file @a43a380
@@ -11,7 +11,7 @@ class SearchContext @@ -11,7 +11,7 @@ class SearchContext
11 return result unless query.present? 11 return result unless query.present?
12 12
13 projects = Project.where(id: project_ids) 13 projects = Project.where(id: project_ids)
14 - result[:projects] = projects.search(query).limit(10) 14 + result[:projects] = projects.search(query).limit(20)
15 15
16 # Search inside singe project 16 # Search inside singe project
17 project = projects.first if projects.length == 1 17 project = projects.first if projects.length == 1
@@ -19,8 +19,8 @@ class SearchContext @@ -19,8 +19,8 @@ class SearchContext
19 if params[:search_code].present? 19 if params[:search_code].present?
20 result[:blobs] = project.repository.search_files(query, params[:repository_ref]) unless project.empty_repo? 20 result[:blobs] = project.repository.search_files(query, params[:repository_ref]) unless project.empty_repo?
21 else 21 else
22 - result[:merge_requests] = MergeRequest.where(project_id: project_ids).search(query).limit(10)  
23 - result[:issues] = Issue.where(project_id: project_ids).search(query).limit(10) 22 + result[:merge_requests] = MergeRequest.where(project_id: project_ids).search(query).limit(20)
  23 + result[:issues] = Issue.where(project_id: project_ids).search(query).limit(20)
24 result[:wiki_pages] = [] 24 result[:wiki_pages] = []
25 end 25 end
26 result 26 result
app/views/shared/_issues.html.haml
  Diff comments   View file @a43a380
@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
9 %ul.well-list.issues-list 9 %ul.well-list.issues-list
10 - group[1].each do |issue| 10 - group[1].each do |issue|
11 = render 'projects/issues/issue', issue: issue 11 = render 'projects/issues/issue', issue: issue
12 - %hr  
13 = paginate @issues, theme: "gitlab" 12 = paginate @issues, theme: "gitlab"
14 - else 13 - else
15 %p.nothing_here_message Nothing to show here 14 %p.nothing_here_message Nothing to show here
app/views/shared/_merge_requests.html.haml
  Diff comments   View file @a43a380
@@ -7,7 +7,6 @@ @@ -7,7 +7,6 @@
7 %ul.well-list.mr-list 7 %ul.well-list.mr-list
8 - group[1].each do |merge_request| 8 - group[1].each do |merge_request|
9 = render 'projects/merge_requests/merge_request', merge_request: merge_request 9 = render 'projects/merge_requests/merge_request', merge_request: merge_request
10 - %hr  
11 = paginate @merge_requests, theme: "gitlab" 10 = paginate @merge_requests, theme: "gitlab"
12 11
13 - else 12 - else