Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

2 files changed, 2 insertions, 10 deletions

diff --git a/app/models/namespaces/project_namespace.rb b/app/models/namespaces/project_namespace.rb
index cf2612b7f33..bf23fc21124 100644
--- a/app/models/namespaces/project_namespace.rb
+++ b/app/models/namespaces/project_namespace.rb
@@ -11,7 +11,8 @@ module Namespaces
     alias_attribute :namespace_id, :parent_id
     has_one :project, foreign_key: :project_namespace_id, inverse_of: :project_namespace
 
-    delegate :execute_hooks, :execute_integrations, to: :project, allow_nil: true
+    delegate :execute_hooks, :execute_integrations, :group, to: :project, allow_nil: true
+    delegate :external_references_supported?, :default_issues_tracker?, to: :project
 
     def self.sti_name
       'Project'
diff --git a/app/models/namespaces/traversal/linear_scopes.rb b/app/models/namespaces/traversal/linear_scopes.rb
index 792964a6c7f..c50d3dd1de6 100644
--- a/app/models/namespaces/traversal/linear_scopes.rb
+++ b/app/models/namespaces/traversal/linear_scopes.rb
@@ -25,8 +25,6 @@ module Namespaces
         end
 
         def self_and_ancestors(include_self: true, upto: nil, hierarchy_order: nil)
-          return super unless use_traversal_ids_for_ancestor_scopes?
-
           self_and_ancestors_from_inner_join(
             include_self: include_self,
             upto: upto, hierarchy_order:
@@ -35,8 +33,6 @@ module Namespaces
         end
 
         def self_and_ancestor_ids(include_self: true)
-          return super unless use_traversal_ids_for_ancestor_scopes?
-
           self_and_ancestors(include_self: include_self).as_ids
         end
 
@@ -87,11 +83,6 @@ module Namespaces
           use_traversal_ids?
         end
 
-        def use_traversal_ids_for_ancestor_scopes?
-          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) &&
           use_traversal_ids?