Commit 62461f77 authored by Nick Thomas's avatar Nick Thomas

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
parents 1deec98f 8fb76e4d
...@@ -14,8 +14,6 @@ class SearchController < ApplicationController ...@@ -14,8 +14,6 @@ class SearchController < ApplicationController
layout 'search' layout 'search'
def show def show
search_service = SearchService.new(current_user, params)
@project = search_service.project @project = search_service.project
@group = search_service.group @group = search_service.group
......
...@@ -50,6 +50,10 @@ module SearchHelper ...@@ -50,6 +50,10 @@ module SearchHelper
filename filename
end end
def search_service
@search_service ||= ::SearchService.new(current_user, params)
end
private private
# Autocomplete results for various settings pages # Autocomplete results for various settings pages
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment