Revert "Avoid loading objects from DB in ES results"
This reverts commit d9cb907c3e987363065136bafb2156e86bc5de26.
This commit is contained in:
parent
182104422b
commit
06440b12d8
|
@ -25,7 +25,6 @@ class SearchController < ApplicationController
|
|||
@show_snippets = search_service.show_snippets?
|
||||
@search_results = search_service.search_results
|
||||
@search_objects = search_service.search_objects
|
||||
@display_options = search_service.display_options
|
||||
|
||||
render_commits if @scope == 'commits'
|
||||
eager_load_user_status if @scope == 'users'
|
||||
|
|
|
@ -72,8 +72,6 @@ class ProjectFeature < ApplicationRecord
|
|||
default_value_for :wiki_access_level, value: ENABLED, allows_nil: false
|
||||
default_value_for :repository_access_level, value: ENABLED, allows_nil: false
|
||||
|
||||
scope :for_project_id, -> (project) { where(project: project) }
|
||||
|
||||
def feature_available?(feature, user)
|
||||
# This feature might not be behind a feature flag at all, so default to true
|
||||
return false unless ::Feature.enabled?(feature, user, default_enabled: true)
|
||||
|
|
|
@ -52,10 +52,6 @@ class SearchService
|
|||
@search_objects ||= search_results.objects(scope, params[:page])
|
||||
end
|
||||
|
||||
def display_options
|
||||
@display_options ||= search_results.display_options(scope)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def search_service
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
.search-results
|
||||
- if @scope == 'projects'
|
||||
.term
|
||||
= render 'shared/projects/list', { projects: @search_objects, pipeline_status: false }.merge(@display_options)
|
||||
= render 'shared/projects/list', projects: @search_objects, pipeline_status: false
|
||||
- else
|
||||
- locals = { projects: blob_projects(@search_objects) } if %w[blobs wiki_blobs].include?(@scope)
|
||||
= render partial: "search/results/#{@scope.singularize}", collection: @search_objects, locals: locals
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
.search-result-row
|
||||
%h4
|
||||
= confidential_icon(issue)
|
||||
= link_to namespace_project_issue_path(issue.project.namespace.becomes(Namespace), issue.project, issue) do
|
||||
= link_to [issue.project.namespace.becomes(Namespace), issue.project, issue] do
|
||||
%span.term.str-truncated= issue.title
|
||||
- if issue.closed?
|
||||
%span.badge.badge-danger.prepend-left-5= _("Closed")
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
.search-result-row
|
||||
%h4
|
||||
= link_to namespace_project_merge_request_path(merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request) do
|
||||
= link_to [merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request] do
|
||||
%span.term.str-truncated= merge_request.title
|
||||
- if merge_request.merged?
|
||||
%span.badge.badge-primary.prepend-left-5= _("Merged")
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
.search-result-row
|
||||
%h4
|
||||
= link_to namespace_project_milestone_path(milestone.project.namespace.becomes(Namespace), milestone.project, milestone) do
|
||||
= link_to [milestone.project.namespace.becomes(Namespace), milestone.project, milestone] do
|
||||
%span.term.str-truncated= milestone.title
|
||||
|
||||
- if milestone.description.present?
|
||||
|
|
|
@ -85,10 +85,6 @@ module Gitlab
|
|||
UsersFinder.new(current_user, search: query).execute
|
||||
end
|
||||
|
||||
def display_options(_scope)
|
||||
{}
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def projects
|
||||
|
|
Loading…
Reference in New Issue