diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
| commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
| tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/controllers/search_controller.rb | |
| parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
| download | gitlab-ce-3cccd102ba543e02725d247893729e5c73b38295.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/controllers/search_controller.rb')
| -rw-r--r-- | app/controllers/search_controller.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 817da658f14..b4e2da0c7b3 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -169,15 +169,17 @@ class SearchController < ApplicationController search_allowed = case params[:scope] when 'blobs' - Feature.enabled?(:global_search_code_tab, current_user, type: :ops, default_enabled: true) + Feature.enabled?(:global_search_code_tab, current_user, type: :ops, default_enabled: :yaml) when 'commits' - Feature.enabled?(:global_search_commits_tab, current_user, type: :ops, default_enabled: true) + Feature.enabled?(:global_search_commits_tab, current_user, type: :ops, default_enabled: :yaml) when 'issues' - Feature.enabled?(:global_search_issues_tab, current_user, type: :ops, default_enabled: true) + Feature.enabled?(:global_search_issues_tab, current_user, type: :ops, default_enabled: :yaml) when 'merge_requests' - Feature.enabled?(:global_search_merge_requests_tab, current_user, type: :ops, default_enabled: true) + Feature.enabled?(:global_search_merge_requests_tab, current_user, type: :ops, default_enabled: :yaml) when 'wiki_blobs' - Feature.enabled?(:global_search_wiki_tab, current_user, type: :ops, default_enabled: true) + Feature.enabled?(:global_search_wiki_tab, current_user, type: :ops, default_enabled: :yaml) + when 'users' + Feature.enabled?(:global_search_users_tab, current_user, type: :ops, default_enabled: :yaml) else true end |