From 36a59d088eca61b834191dacea009677a96c052f Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 19 May 2022 07:33:21 +0000
Subject: Add latest changes from gitlab-org/gitlab@15-0-stable-ee

---
 lib/gitlab/import_export/group/import_export.yml         | 4 ++++
 lib/gitlab/import_export/group/relation_factory.rb       | 4 ++++
 lib/gitlab/import_export/group/relation_tree_restorer.rb | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'lib/gitlab/import_export/group')

diff --git a/lib/gitlab/import_export/group/import_export.yml b/lib/gitlab/import_export/group/import_export.yml
index f7ab1677001..8df5d52bf77 100644
--- a/lib/gitlab/import_export/group/import_export.yml
+++ b/lib/gitlab/import_export/group/import_export.yml
@@ -16,6 +16,7 @@ tree:
         - :board
     - members:
       - :user
+    - :namespace_settings
 
 included_attributes:
   user:
@@ -24,6 +25,8 @@ included_attributes:
     - :username
   author:
     - :name
+  namespace_settings:
+    - :prevent_sharing_groups_outside_hierarchy
 
 excluded_attributes:
   group:
@@ -38,6 +41,7 @@ excluded_attributes:
     - :shared_runners_minute_limit
     - :extra_shared_runners_minutes_limit
     - :repository_size_limit
+    - :max_pages_size
   epics:
     - :state_id
 
diff --git a/lib/gitlab/import_export/group/relation_factory.rb b/lib/gitlab/import_export/group/relation_factory.rb
index adbbd37ce10..258078d595b 100644
--- a/lib/gitlab/import_export/group/relation_factory.rb
+++ b/lib/gitlab/import_export/group/relation_factory.rb
@@ -30,6 +30,10 @@ module Gitlab
           update_group_references
         end
 
+        def invalid_relation?
+          @relation_name == :namespace_settings
+        end
+
         def update_group_references
           return unless self.class.existing_object_relations.include?(@relation_name)
           return unless @relation_hash['group_id']
diff --git a/lib/gitlab/import_export/group/relation_tree_restorer.rb b/lib/gitlab/import_export/group/relation_tree_restorer.rb
index b44874f598c..4b28dd831fc 100644
--- a/lib/gitlab/import_export/group/relation_tree_restorer.rb
+++ b/lib/gitlab/import_export/group/relation_tree_restorer.rb
@@ -89,7 +89,7 @@ module Gitlab
         end
 
         def save_relation_object(relation_object, relation_key, relation_definition, relation_index)
-          if Feature.enabled?(:import_relation_object_persistence, default_enabled: :yaml) && relation_object.new_record?
+          if Feature.enabled?(:import_relation_object_persistence) && relation_object.new_record?
             Gitlab::ImportExport::Base::RelationObjectSaver.new(
               relation_object: relation_object,
               relation_key: relation_key,
-- 
cgit v1.2.3