Merge branch 'ce-1607-elastic_feature_flag_per_group' into 'master'

Backport of 1607-elastic_feature_flag_per_group

See merge request gitlab-org/gitlab-ce!25825

app/controllers/search_controller.rb

@@ -14,8 +14,6 @@ class SearchController < ApplicationController
   layout 'search'
   def show
-    search_service = SearchService.new(current_user, params)
-
     @project = search_service.project
     @group = search_service.group

app/helpers/search_helper.rb

@@ -50,6 +50,10 @@ module SearchHelper
     filename
   end
+  def search_service
+    @search_service ||= ::SearchService.new(current_user, params)
+  end
+
   private
   # Autocomplete results for various settings pages