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

5 files changed, 4 insertions, 2 deletions

diff --git a/app/assets/images/select2-spinner.gif b/app/assets/images/select2-spinner.gif
new file mode 100755
index 00000000000..5b33f7e54f4
--- /dev/null
+++ b/app/assets/images/select2-spinner.gif
diff --git a/app/assets/images/select2.png b/app/assets/images/select2.png
new file mode 100755
index 00000000000..1d804ffb996
--- /dev/null
+++ b/app/assets/images/select2.png
diff --git a/app/assets/images/select2x2.png b/app/assets/images/select2x2.png
new file mode 100755
index 00000000000..4bdd5c961d4
--- /dev/null
+++ b/app/assets/images/select2x2.png
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 90d4bc674d9..a80ab3bcd28 100644
--- a/app/controllers/search_controller.rb
+++ b/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
 
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 09165979b26..69520e33774 100644
--- a/app/helpers/search_helper.rb
+++ b/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