diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-06 18:09:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-06 18:09:03 +0300 |
| commit | 67fa8362ae35ab6134454aa74ad536eb405dff29 (patch) | |
| tree | 8adb151eabf5467dd3c3ee7dfbd0a7df70c5fd51 /app/finders | |
| parent | 669ad9e431c7647f01bda681aab2c0ad2cb58826 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/group_descendants_finder.rb | 2 | ||||
| -rw-r--r-- | app/finders/groups_finder.rb | 4 | ||||
| -rw-r--r-- | app/finders/issuable_finder.rb | 4 | ||||
| -rw-r--r-- | app/finders/user_recent_events_finder.rb | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/app/finders/group_descendants_finder.rb b/app/finders/group_descendants_finder.rb index 40d6be03a17..42cd06c8066 100644 --- a/app/finders/group_descendants_finder.rb +++ b/app/finders/group_descendants_finder.rb @@ -112,7 +112,7 @@ class GroupDescendantsFinder group_ids = base_for_ancestors.except(:select, :sort).select(:id) groups = Group.where(id: group_ids) - if Feature.enabled?(:linear_group_descendants_finder_upto, current_user, default_enabled: :yaml) + if Feature.enabled?(:linear_group_descendants_finder_upto, current_user) groups.self_and_ancestors(upto: parent_group.id) else Gitlab::ObjectHierarchy.new(groups).base_and_ancestors(upto: parent_group.id) diff --git a/app/finders/groups_finder.rb b/app/finders/groups_finder.rb index 7cb3e7a5d7f..9a8bc74f435 100644 --- a/app/finders/groups_finder.rb +++ b/app/finders/groups_finder.rb @@ -54,7 +54,7 @@ class GroupsFinder < UnionFinder groups = [] if current_user - if Feature.enabled?(:use_traversal_ids_groups_finder, current_user, default_enabled: :yaml) + if Feature.enabled?(:use_traversal_ids_groups_finder, current_user) groups << current_user.authorized_groups.self_and_ancestors groups << current_user.groups.self_and_descendants else @@ -81,7 +81,7 @@ class GroupsFinder < UnionFinder .groups .where('members.access_level >= ?', params[:min_access_level]) - if Feature.enabled?(:use_traversal_ids_groups_finder, current_user, default_enabled: :yaml) + if Feature.enabled?(:use_traversal_ids_groups_finder, current_user) groups.self_and_descendants else Gitlab::ObjectHierarchy diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb index bf7b2265ded..fe07a52cbf0 100644 --- a/app/finders/issuable_finder.rb +++ b/app/finders/issuable_finder.rb @@ -348,7 +348,7 @@ class IssuableFinder params[:in].blank? && klass.try(:pg_full_text_searchable_columns).present? && params[:search] =~ FULL_TEXT_SEARCH_TERM_REGEX && - Feature.enabled?(:issues_full_text_search, params.project || params.group, default_enabled: :yaml) + Feature.enabled?(:issues_full_text_search, params.project || params.group) end # rubocop: disable CodeReuse/ActiveRecord @@ -489,7 +489,7 @@ class IssuableFinder def or_filters_enabled? strong_memoize(:or_filters_enabled) do - Feature.enabled?(:or_issuable_queries, feature_flag_scope, default_enabled: :yaml) + Feature.enabled?(:or_issuable_queries, feature_flag_scope) end end diff --git a/app/finders/user_recent_events_finder.rb b/app/finders/user_recent_events_finder.rb index 2cdf7819d23..64903c67573 100644 --- a/app/finders/user_recent_events_finder.rb +++ b/app/finders/user_recent_events_finder.rb @@ -73,7 +73,7 @@ class UserRecentEventsFinder return Event.none if users.empty? - if Feature.enabled?(:optimized_followed_users_queries, current_user, default_enabled: :yaml) + if Feature.enabled?(:optimized_followed_users_queries, current_user) query_builder_params = event_filter.in_operator_query_builder_params(users) Gitlab::Pagination::Keyset::InOperatorOptimization::QueryBuilder |