Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

3 files changed, 8 insertions, 2 deletions

diff --git a/lib/gitlab/import_export/project/import_export.yml b/lib/gitlab/import_export/project/import_export.yml
index 7dcf26ca89a..1625c39595c 100644
--- a/lib/gitlab/import_export/project/import_export.yml
+++ b/lib/gitlab/import_export/project/import_export.yml
@@ -48,6 +48,8 @@ tree:
         - :award_emoji
     - releases:
       - :links
+      - milestone_releases:
+        - :milestone
     - project_members:
       - :user
     - merge_requests:
@@ -752,6 +754,7 @@ excluded_attributes:
     - :compliance_framework_setting
     - :show_default_award_emojis
     - :warn_about_potentially_unwanted_characters
+    - :enforce_auth_checks_on_uploads
     - :services
     - :exported_protected_branches
     - :repository_size_limit
@@ -957,6 +960,9 @@ excluded_attributes:
   system_note_metadata:
     - :description_version_id
     - :note_id
+  milestone_releases:
+    - :milestone_id
+    - :release_id
 methods:
   notes:
     - :type
diff --git a/lib/gitlab/import_export/project/tree_restorer.rb b/lib/gitlab/import_export/project/tree_restorer.rb
index d8992061524..47f82a901b7 100644
--- a/lib/gitlab/import_export/project/tree_restorer.rb
+++ b/lib/gitlab/import_export/project/tree_restorer.rb
@@ -54,7 +54,7 @@ module Gitlab
         end
 
         def ndjson_relation_reader
-          return unless Feature.enabled?(:project_import_ndjson, project.namespace, default_enabled: true)
+          return unless Feature.enabled?(:project_import_ndjson, project.namespace)
 
           ImportExport::Json::NdjsonReader.new(
             File.join(shared.export_path, 'tree')
diff --git a/lib/gitlab/import_export/project/tree_saver.rb b/lib/gitlab/import_export/project/tree_saver.rb
index 63c5afa9595..05dcfa5282c 100644
--- a/lib/gitlab/import_export/project/tree_saver.rb
+++ b/lib/gitlab/import_export/project/tree_saver.rb
@@ -80,7 +80,7 @@ module Gitlab
 
         def json_writer
           @json_writer ||= begin
-            if ::Feature.enabled?(:project_export_as_ndjson, @project.namespace, default_enabled: true)
+            if ::Feature.enabled?(:project_export_as_ndjson, @project.namespace)
               full_path = File.join(@shared.export_path, 'tree')
               Gitlab::ImportExport::Json::NdjsonWriter.new(full_path)
             else