Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 0 deletions

diff --git a/app/models/namespaces/traversal/linear.rb b/app/models/namespaces/traversal/linear.rb
index 5a5f2a5d063..757a0e40eb3 100644
--- a/app/models/namespaces/traversal/linear.rb
+++ b/app/models/namespaces/traversal/linear.rb
@@ -57,6 +57,13 @@ module Namespaces
         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)
+
+        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)
@@ -107,6 +114,12 @@ module Namespaces
         self_and_descendants.where.not(id: id)
       end
 
+      def self_and_hierarchy
+        return super unless use_traversal_ids_for_self_and_hierarchy?
+
+        self_and_descendants.or(ancestors)
+      end
+
       def ancestors(hierarchy_order: nil)
         return super unless use_traversal_ids_for_ancestors?