diff options
| author | Mario de la Ossa <mariodelaossa@gmail.com> | 2019-03-06 13:33:06 -0600 |
|---|---|---|
| committer | Mario de la Ossa <mariodelaossa@gmail.com> | 2019-03-28 12:14:18 -0600 |
| commit | 8fb76e4d1bab37ba8aa4fbdad3a845ec4506ce69 (patch) | |
| tree | e5575f60308d6024ff100872f7cebba3a9d65d6c | |
| parent | 12818c20430bec5b54903e19ff78b0575c61f05c (diff) | |
| download | gitlab-ce-ce-1607-elastic_feature_flag_per_group.tar.gz | |
Backport of 1607-elastic_feature_flag_per_groupce-1607-elastic_feature_flag_per_group
| -rwxr-xr-x | app/assets/images/select2-spinner.gif | bin | 0 -> 1849 bytes | |||
| -rwxr-xr-x | app/assets/images/select2.png | bin | 0 -> 613 bytes | |||
| -rwxr-xr-x | app/assets/images/select2x2.png | bin | 0 -> 845 bytes | |||
| -rw-r--r-- | app/controllers/search_controller.rb | 2 | ||||
| -rw-r--r-- | app/helpers/search_helper.rb | 4 |
5 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/images/select2-spinner.gif b/app/assets/images/select2-spinner.gif Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 1b22907c10f..e50b2c2cc4d 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 0ee76a51f7d..08a723c320f 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -45,6 +45,10 @@ module SearchHelper filename end + def search_service + @search_service ||= ::SearchService.new(current_user, params) + end + private # Autocomplete results for various settings pages |
