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/models/namespaces | |
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/models/namespaces')
-rw-r--r-- | app/models/namespaces/traversal/linear.rb | 12 | ||||
-rw-r--r-- | app/models/namespaces/traversal/linear_scopes.rb | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/app/models/namespaces/traversal/linear.rb b/app/models/namespaces/traversal/linear.rb index 6320e0bc39d..b0350b0288f 100644 --- a/app/models/namespaces/traversal/linear.rb +++ b/app/models/namespaces/traversal/linear.rb @@ -77,38 +77,38 @@ module Namespaces end def sync_traversal_ids? - Feature.enabled?(:sync_traversal_ids, root_ancestor, default_enabled: :yaml) + Feature.enabled?(:sync_traversal_ids, root_ancestor) end def use_traversal_ids? - return false unless Feature.enabled?(:use_traversal_ids, default_enabled: :yaml) + return false unless Feature.enabled?(:use_traversal_ids) traversal_ids.present? end def use_traversal_ids_for_self_and_hierarchy? return false unless use_traversal_ids? - return false unless Feature.enabled?(:use_traversal_ids_for_self_and_hierarchy, root_ancestor, default_enabled: :yaml) + return false unless Feature.enabled?(:use_traversal_ids_for_self_and_hierarchy, root_ancestor) traversal_ids.present? end def use_traversal_ids_for_ancestors? return false unless use_traversal_ids? - return false unless Feature.enabled?(:use_traversal_ids_for_ancestors, root_ancestor, default_enabled: :yaml) + return false unless Feature.enabled?(:use_traversal_ids_for_ancestors, root_ancestor) traversal_ids.present? end def use_traversal_ids_for_ancestors_upto? return false unless use_traversal_ids? - return false unless Feature.enabled?(:use_traversal_ids_for_ancestors_upto, root_ancestor, default_enabled: :yaml) + return false unless Feature.enabled?(:use_traversal_ids_for_ancestors_upto, root_ancestor) traversal_ids.present? end def use_traversal_ids_for_root_ancestor? - return false unless Feature.enabled?(:use_traversal_ids_for_root_ancestor, default_enabled: :yaml) + return false unless Feature.enabled?(:use_traversal_ids_for_root_ancestor) traversal_ids.present? end diff --git a/app/models/namespaces/traversal/linear_scopes.rb b/app/models/namespaces/traversal/linear_scopes.rb index 0cac4c9143a..f0e9a8feeb2 100644 --- a/app/models/namespaces/traversal/linear_scopes.rb +++ b/app/models/namespaces/traversal/linear_scopes.rb @@ -55,7 +55,7 @@ module Namespaces def self_and_descendants(include_self: true) return super unless use_traversal_ids_for_descendants_scopes? - if Feature.enabled?(:traversal_ids_btree, default_enabled: :yaml) + if Feature.enabled?(:traversal_ids_btree) self_and_descendants_with_comparison_operators(include_self: include_self) else records = self_and_descendants_with_duplicates_with_array_operator(include_self: include_self) @@ -67,7 +67,7 @@ module Namespaces def self_and_descendant_ids(include_self: true) return super unless use_traversal_ids_for_descendants_scopes? - if Feature.enabled?(:traversal_ids_btree, default_enabled: :yaml) + if Feature.enabled?(:traversal_ids_btree) self_and_descendants_with_comparison_operators(include_self: include_self).as_ids else self_and_descendants_with_duplicates_with_array_operator(include_self: include_self) @@ -102,26 +102,26 @@ module Namespaces private def use_traversal_ids? - Feature.enabled?(:use_traversal_ids, default_enabled: :yaml) + Feature.enabled?(:use_traversal_ids) end def use_traversal_ids_roots? - Feature.enabled?(:use_traversal_ids_roots, default_enabled: :yaml) && + Feature.enabled?(:use_traversal_ids_roots) && use_traversal_ids? end def use_traversal_ids_for_ancestor_scopes? - Feature.enabled?(:use_traversal_ids_for_ancestor_scopes, default_enabled: :yaml) && + Feature.enabled?(:use_traversal_ids_for_ancestor_scopes) && use_traversal_ids? end def use_traversal_ids_for_descendants_scopes? - Feature.enabled?(:use_traversal_ids_for_descendants_scopes, default_enabled: :yaml) && + Feature.enabled?(:use_traversal_ids_for_descendants_scopes) && use_traversal_ids? end def use_traversal_ids_for_self_and_hierarchy_scopes? - Feature.enabled?(:use_traversal_ids_for_self_and_hierarchy_scopes, default_enabled: :yaml) && + Feature.enabled?(:use_traversal_ids_for_self_and_hierarchy_scopes) && use_traversal_ids? end |