diff options
Diffstat (limited to 'app/models/namespaces/traversal/linear_scopes.rb')
| -rw-r--r-- | app/models/namespaces/traversal/linear_scopes.rb | 14 |
1 files changed, 7 insertions, 7 deletions
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 |