Merge branch 'ce-avoid_n_plus_1_es_load_blobs' into 'master'
Backport of avoid_n_plus_1_es_load_blobs See merge request gitlab-org/gitlab-ce!26522
This commit is contained in:
commit
3844ab70c5
|
@ -33,10 +33,15 @@ module SearchHelper
|
|||
"Showing #{from} - #{to} of #{count} #{scope.humanize(capitalize: false)} for \"#{term}\""
|
||||
end
|
||||
|
||||
def find_project_for_result_blob(result)
|
||||
def find_project_for_result_blob(projects, result)
|
||||
@project
|
||||
end
|
||||
|
||||
# Used in EE
|
||||
def blob_projects(results)
|
||||
nil
|
||||
end
|
||||
|
||||
def parse_search_result(result)
|
||||
result
|
||||
end
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
- if @scope == 'projects'
|
||||
.term
|
||||
= render 'shared/projects/list', projects: @search_objects, pipeline_status: false
|
||||
- elsif %w[blobs wiki_blobs].include?(@scope)
|
||||
= render partial: 'search/results/blob', collection: @search_objects, locals: { projects: blob_projects(@search_objects) }
|
||||
- else
|
||||
= render partial: "search/results/#{@scope.singularize}", collection: @search_objects
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
- project = find_project_for_result_blob(blob)
|
||||
- project = find_project_for_result_blob(projects, blob)
|
||||
- return unless project
|
||||
|
||||
- blob = parse_search_result(blob)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
- project = find_project_for_result_blob(wiki_blob)
|
||||
- project = find_project_for_result_blob(projects, wiki_blob)
|
||||
- wiki_blob = parse_search_result(wiki_blob)
|
||||
- wiki_blob_link = project_wiki_path(project, wiki_blob.basename)
|
||||
|
||||
|
|
Loading…
Reference in New Issue