diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 07:33:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 07:33:21 +0000 |
| commit | 36a59d088eca61b834191dacea009677a96c052f (patch) | |
| tree | e4f33972dab5d8ef79e3944a9f403035fceea43f /app/helpers/search_helper.rb | |
| parent | a1761f15ec2cae7c7f7bbda39a75494add0dfd6f (diff) | |
| download | gitlab-ce-36a59d088eca61b834191dacea009677a96c052f.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42
Diffstat (limited to 'app/helpers/search_helper.rb')
| -rw-r--r-- | app/helpers/search_helper.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index f8bfc74b344..69bea0abd88 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -374,8 +374,6 @@ module SearchHelper autocomplete: 'off' } - opts[:data]['runner-tags-endpoint'] = tag_list_admin_runners_path - if @project.present? opts[:data]['project-id'] = @project.id opts[:data]['labels-endpoint'] = project_labels_path(@project) @@ -445,7 +443,7 @@ module SearchHelper return false unless can?(current_user, :read_users_list) return true if @group - Feature.enabled?(:global_search_users_tab, current_user, type: :ops, default_enabled: :yaml) + Feature.enabled?(:global_search_users_tab, current_user, type: :ops) end def issuable_state_to_badge_class(issuable) @@ -479,7 +477,7 @@ module SearchHelper end def feature_flag_tab_enabled?(flag) - @group || Feature.enabled?(flag, current_user, type: :ops, default_enabled: true) + @group || Feature.enabled?(flag, current_user, type: :ops) end end |