diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-03-29 11:54:48 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-03-29 11:54:48 +0000 |
| commit | 62461f77b83de4508176bf0086008bbc2eb0a07b (patch) | |
| tree | 6e805b3b79353f9f2b4debbb94f5730b2e64e6f4 /app/controllers/search_controller.rb | |
| parent | 1deec98fb0845632357107be6e8dfd719d04c72e (diff) | |
| parent | 8fb76e4d1bab37ba8aa4fbdad3a845ec4506ce69 (diff) | |
| download | gitlab-ce-62461f77b83de4508176bf0086008bbc2eb0a07b.tar.gz | |
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
Diffstat (limited to 'app/controllers/search_controller.rb')
| -rw-r--r-- | app/controllers/search_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
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 |