Merge branch 'ce-12091-remove-elasticsearch-lite-project' into 'master'

Backport changes from 'Partially revert d9cb907c: "Avoid loading objects from DB in ES results"' See merge request gitlab-org/gitlab-ce!29597

Merge branch 'ce-12091-remove-elasticsearch-lite-project' into 'master'
Backport changes from 'Partially revert d9cb907c: "Avoid loading objects from DB in ES results"' See merge request gitlab-org/gitlab-ce!29597
0a70ba17 · Sean McGivern · 0c4059ef · 0a2c334c · 0a70ba17 · 0a70ba17
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -25,7 +25,6 @@ def show
    @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'

--- a/app/models/project_feature.rb
+++ b/app/models/project_feature.rb
@@ -72,8 +72,6 @@ def ensure_feature!(feature)
  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)

--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -52,10 +52,6 @@ def search_objects
    @search_objects ||= search_results.objects(scope, params[:page])
  end

-  def display_options
-    @display_options ||= search_results.display_options(scope)
-  end
-
  private

  def search_service

--- a/app/views/search/_results.html.haml
+++ b/app/views/search/_results.html.haml
@@ -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

--- a/lib/gitlab/search_results.rb
+++ b/lib/gitlab/search_results.rb
@@ -85,10 +85,6 @@ def users
      UsersFinder.new(current_user, search: query).execute
    end

-    def display_options(_scope)
-      {}
-    end
-
    private

    def projects