Add latest changes from gitlab-org/gitlab@13-0-stable-ee

22 files changed, 495 insertions, 67 deletions

diff --git a/lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb b/lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb
index fd98bc2caad..e2dba831661 100644
--- a/lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb
+++ b/lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb
@@ -52,7 +52,10 @@ module Gitlab
         end
 
         def headers
-          { 'Content-Length' => export_size.to_s }
+          {
+            'Content-Type' => 'application/gzip',
+            'Content-Length' => export_size.to_s
+          }
         end
 
         def export_size
diff --git a/lib/gitlab/import_export/design_repo_restorer.rb b/lib/gitlab/import_export/design_repo_restorer.rb
new file mode 100644
index 00000000000..a702c58a7c2
--- /dev/null
+++ b/lib/gitlab/import_export/design_repo_restorer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module ImportExport
+    class DesignRepoRestorer < RepoRestorer
+      def initialize(project:, shared:, path_to_bundle:)
+        super(project: project, shared: shared, path_to_bundle: path_to_bundle)
+
+        @repository = project.design_repository
+      end
+
+      # `restore` method is handled in super class
+    end
+  end
+end
diff --git a/lib/gitlab/import_export/design_repo_saver.rb b/lib/gitlab/import_export/design_repo_saver.rb
new file mode 100644
index 00000000000..db9ebee6a13
--- /dev/null
+++ b/lib/gitlab/import_export/design_repo_saver.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module ImportExport
+    class DesignRepoSaver < RepoSaver
+      def save
+        @repository = project.design_repository
+
+        super
+      end
+
+      private
+
+      def bundle_full_path
+        File.join(shared.export_path, ::Gitlab::ImportExport.design_repo_bundle_filename)
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/import_export/group/group_restorer.rb b/lib/gitlab/import_export/group/group_restorer.rb
new file mode 100644
index 00000000000..b338950fb71
--- /dev/null
+++ b/lib/gitlab/import_export/group/group_restorer.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module ImportExport
+    module Group
+      class GroupRestorer
+        def initialize(
+          user:,
+          shared:,
+          group:,
+          attributes:,
+          importable_path:,
+          relation_reader:,
+          reader:
+        )
+          @user = user
+          @shared = shared
+          @group = group
+          @group_attributes = attributes
+          @importable_path = importable_path
+          @relation_reader = relation_reader
+          @reader = reader
+        end
+
+        def restore
+          # consume_relation returns a list of [relation, index]
+          @group_members = @relation_reader
+            .consume_relation(@importable_path, 'members')
+            .map(&:first)
+
+          return unless members_mapper.map
+
+          restorer.restore
+        end
+
+        private
+
+        def restorer
+          @relation_tree_restorer ||= RelationTreeRestorer.new(
+            user: @user,
+            shared: @shared,
+            relation_reader: @relation_reader,
+            members_mapper: members_mapper,
+            object_builder: object_builder,
+            relation_factory: relation_factory,
+            reader: @reader,
+            importable: @group,
+            importable_attributes: @group_attributes,
+            importable_path: @importable_path
+          )
+        end
+
+        def members_mapper
+          @members_mapper ||= Gitlab::ImportExport::MembersMapper.new(
+            exported_members: @group_members,
+            user: @user,
+            importable: @group
+          )
+        end
+
+        def relation_factory
+          Gitlab::ImportExport::Group::RelationFactory
+        end
+
+        def object_builder
+          Gitlab::ImportExport::Group::ObjectBuilder
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/import_export/group/import_export.yml b/lib/gitlab/import_export/group/import_export.yml
index 5008639077c..e30206dc509 100644
--- a/lib/gitlab/import_export/group/import_export.yml
+++ b/lib/gitlab/import_export/group/import_export.yml
@@ -27,9 +27,7 @@ included_attributes:
 
 excluded_attributes:
   group:
-    - :id
     - :owner_id
-    - :parent_id
     - :created_at
     - :updated_at
     - :runners_token
diff --git a/lib/gitlab/import_export/group/legacy_import_export.yml b/lib/gitlab/import_export/group/legacy_import_export.yml
new file mode 100644
index 00000000000..5008639077c
--- /dev/null
+++ b/lib/gitlab/import_export/group/legacy_import_export.yml
@@ -0,0 +1,86 @@
+# Model relationships to be included in the group import/export
+#
+# This list _must_ only contain relationships that are available to both FOSS and
+# Enterprise editions. EE specific relationships must be defined in the `ee` section further
+# down below.
+tree:
+  group:
+    - :milestones
+    - :badges
+    - labels:
+      - :priorities
+    - boards:
+      - lists:
+        - label:
+          - :priorities
+        - :board
+    - members:
+      - :user
+
+included_attributes:
+  user:
+    - :id
+    - :email
+    - :username
+  author:
+    - :name
+
+excluded_attributes:
+  group:
+    - :id
+    - :owner_id
+    - :parent_id
+    - :created_at
+    - :updated_at
+    - :runners_token
+    - :runners_token_encrypted
+    - :saml_discovery_token
+    - :visibility_level
+    - :trial_ends_on
+    - :shared_runners_minute_limit
+    - :extra_shared_runners_minutes_limit
+  epics:
+    - :state_id
+
+methods:
+  labels:
+    - :type
+  label:
+    - :type
+  badges:
+    - :type
+  notes:
+    - :type
+  events:
+    - :action
+  lists:
+    - :list_type
+  epics:
+    - :state
+
+preloads:
+
+# EE specific relationships and settings to include. All of this will be merged
+# into the previous structures if EE is used.
+ee:
+  tree:
+    group:
+      - epics:
+        - :parent
+        - :award_emoji
+        - events:
+          - :push_event_payload
+        - notes:
+          - :author
+          - :award_emoji
+          - events:
+            - :push_event_payload
+      - boards:
+        - :board_assignee
+        - :milestone
+        - labels:
+          - :priorities
+        - lists:
+          - milestone:
+            - events:
+              - :push_event_payload
diff --git a/lib/gitlab/import_export/group/legacy_tree_restorer.rb b/lib/gitlab/import_export/group/legacy_tree_restorer.rb
index 5d96a0f3c0a..5499b79cee6 100644
--- a/lib/gitlab/import_export/group/legacy_tree_restorer.rb
+++ b/lib/gitlab/import_export/group/legacy_tree_restorer.rb
@@ -122,7 +122,7 @@ module Gitlab
           @reader ||= Gitlab::ImportExport::Reader.new(
             shared: @shared,
             config: Gitlab::ImportExport::Config.new(
-              config: Gitlab::ImportExport.group_config_file
+              config: Gitlab::ImportExport.legacy_group_config_file
             ).to_h
           )
         end
diff --git a/lib/gitlab/import_export/group/legacy_tree_saver.rb b/lib/gitlab/import_export/group/legacy_tree_saver.rb
index 3776ef0d8f5..7ab81c09885 100644
--- a/lib/gitlab/import_export/group/legacy_tree_saver.rb
+++ b/lib/gitlab/import_export/group/legacy_tree_saver.rb
@@ -43,7 +43,7 @@ module Gitlab
           @reader ||= Gitlab::ImportExport::Reader.new(
             shared: @shared,
             config: Gitlab::ImportExport::Config.new(
-              config: Gitlab::ImportExport.group_config_file
+              config: Gitlab::ImportExport.legacy_group_config_file
             ).to_h
           )
         end
diff --git a/lib/gitlab/import_export/group/tree_restorer.rb b/lib/gitlab/import_export/group/tree_restorer.rb
new file mode 100644
index 00000000000..d0c0999f291
--- /dev/null
+++ b/lib/gitlab/import_export/group/tree_restorer.rb
@@ -0,0 +1,140 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module ImportExport
+    module Group
+      class TreeRestorer
+        include Gitlab::Utils::StrongMemoize
+
+        attr_reader :user, :shared
+
+        def initialize(user:, shared:, group:)
+          @user = user
+          @shared = shared
+          @top_level_group = group
+          @groups_mapping = {}
+        end
+
+        def restore
+          group_ids = relation_reader.consume_relation('groups', '_all').map { |value, _idx| Integer(value) }
+          root_group_id = group_ids.delete_at(0)
+
+          process_root(root_group_id)
+
+          group_ids.each do |group_id|
+            process_child(group_id)
+          end
+
+          true
+        rescue => e
+          shared.error(e)
+          false
+        end
+
+        class GroupAttributes
+          attr_reader :attributes, :group_id, :id, :path
+
+          def initialize(group_id, relation_reader)
+            @group_id = group_id
+
+            @path = "groups/#{group_id}"
+            @attributes = relation_reader.consume_attributes(@path)
+            @id = @attributes.delete('id')
+
+            unless @id == @group_id
+              raise ArgumentError, "Invalid group_id for #{group_id}"
+            end
+          end
+
+          def delete_attribute(name)
+            attributes.delete(name)
+          end
+
+          def delete_attributes(*names)
+            names.map(&method(:delete_attribute))
+          end
+        end
+        private_constant :GroupAttributes
+
+        private
+
+        def process_root(group_id)
+          group_attributes = GroupAttributes.new(group_id, relation_reader)
+
+          # name and path are not imported on the root group to avoid conflict
+          # with existing groups name and/or path.
+          group_attributes.delete_attributes('name', 'path')
+
+          restore_group(@top_level_group, group_attributes)
+        end
+
+        def process_child(group_id)
+          group_attributes = GroupAttributes.new(group_id, relation_reader)
+
+          group = create_group(group_attributes)
+
+          restore_group(group, group_attributes)
+        end
+
+        def create_group(group_attributes)
+          parent_id = group_attributes.delete_attribute('parent_id')
+          name = group_attributes.delete_attribute('name')
+          path = group_attributes.delete_attribute('path')
+
+          parent_group = @groups_mapping.fetch(parent_id) { raise(ArgumentError, 'Parent group not found') }
+
+          ::Groups::CreateService.new(
+            user,
+            name: name,
+            path: path,
+            parent_id: parent_group.id,
+            visibility_level: sub_group_visibility_level(group_attributes.attributes, parent_group)
+          ).execute
+        end
+
+        def restore_group(group, group_attributes)
+          @groups_mapping[group_attributes.id] = group
+
+          Group::GroupRestorer.new(
+            user: user,
+            shared: shared,
+            group: group,
+            attributes: group_attributes.attributes,
+            importable_path: group_attributes.path,
+            relation_reader: relation_reader,
+            reader: reader
+          ).restore
+        end
+
+        def relation_reader
+          strong_memoize(:relation_reader) do
+            ImportExport::JSON::NdjsonReader.new(
+              File.join(shared.export_path, 'tree')
+            )
+          end
+        end
+
+        def sub_group_visibility_level(group_hash, parent_group)
+          original_visibility_level = group_hash['visibility_level'] || Gitlab::VisibilityLevel::PRIVATE
+
+          if parent_group && parent_group.visibility_level < original_visibility_level
+            Gitlab::VisibilityLevel.closest_allowed_level(parent_group.visibility_level)
+          else
+            original_visibility_level
+          end
+        end
+
+        def reader
+          strong_memoize(:reader) do
+            Gitlab::ImportExport::Reader.new(
+              shared: @shared,
+              config: Gitlab::ImportExport::Config.new(
+                config: Gitlab::ImportExport.group_config_file
+              ).to_h
+            )
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/import_export/group/tree_saver.rb b/lib/gitlab/import_export/group/tree_saver.rb
new file mode 100644
index 00000000000..d538de33c51
--- /dev/null
+++ b/lib/gitlab/import_export/group/tree_saver.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module ImportExport
+    module Group
+      class TreeSaver
+        attr_reader :full_path, :shared
+
+        def initialize(group:, current_user:, shared:, params: {})
+          @params = params
+          @current_user = current_user
+          @shared = shared
+          @group = group
+          @full_path = File.join(@shared.export_path, 'tree')
+        end
+
+        def save
+          all_groups = Enumerator.new do |group_ids|
+            groups.each do |group|
+              serialize(group)
+              group_ids << group.id
+            end
+          end
+
+          json_writer.write_relation_array('groups', '_all', all_groups)
+
+          true
+        rescue => e
+          @shared.error(e)
+          false
+        ensure
+          json_writer&.close
+        end
+
+        private
+
+        def groups
+          @groups ||= Gitlab::ObjectHierarchy
+            .new(::Group.where(id: @group.id))
+            .base_and_descendants(with_depth: true)
+            .order_by(:depth)
+        end
+
+        def serialize(group)
+          ImportExport::JSON::StreamingSerializer.new(
+            group,
+            group_tree,
+            json_writer,
+            exportable_path: "groups/#{group.id}"
+          ).execute
+        end
+
+        def group_tree
+          @group_tree ||= Gitlab::ImportExport::Reader.new(
+            shared: @shared,
+            config: group_config
+          ).group_tree
+        end
+
+        def group_config
+          Gitlab::ImportExport::Config.new(
+            config: Gitlab::ImportExport.group_config_file
+          ).to_h
+        end
+
+        def json_writer
+          @json_writer ||= ImportExport::JSON::NdjsonWriter.new(@full_path)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/import_export/importer.rb b/lib/gitlab/import_export/importer.rb
index 4b761eb86ae..b1219384732 100644
--- a/lib/gitlab/import_export/importer.rb
+++ b/lib/gitlab/import_export/importer.rb
@@ -34,7 +34,7 @@ module Gitlab
       attr_accessor :archive_file, :current_user, :project, :shared
 
       def restorers
-        [repo_restorer, wiki_restorer, project_tree, avatar_restorer,
+        [repo_restorer, wiki_restorer, project_tree, avatar_restorer, design_repo_restorer,
          uploads_restorer, lfs_restorer, statistics_restorer, snippets_repo_restorer]
       end
 
@@ -71,6 +71,12 @@ module Gitlab
                                                wiki_enabled: project.wiki_enabled?)
       end
 
+      def design_repo_restorer
+        Gitlab::ImportExport::DesignRepoRestorer.new(path_to_bundle: design_repo_path,
+                                                     shared: shared,
+                                                     project: project)
+      end
+
       def uploads_restorer
         Gitlab::ImportExport::UploadsRestorer.new(project: project, shared: shared)
       end
@@ -101,6 +107,10 @@ module Gitlab
         File.join(shared.export_path, Gitlab::ImportExport.wiki_repo_bundle_filename)
       end
 
+      def design_repo_path
+        File.join(shared.export_path, Gitlab::ImportExport.design_repo_bundle_filename)
+      end
+
       def remove_import_file
         upload = project.import_export_upload
 
@@ -111,13 +121,17 @@ module Gitlab
       end
 
       def overwrite_project
-        return unless can?(current_user, :admin_namespace, project.namespace)
+        return true unless overwrite_project?
 
-        if overwrite_project?
-          ::Projects::OverwriteProjectService.new(project, current_user)
-                                             .execute(project_to_overwrite)
+        unless can?(current_user, :admin_namespace, project.namespace)
+          message = "User #{current_user&.username} (#{current_user&.id}) cannot overwrite a project in #{project.namespace.path}"
+          @shared.error(::Projects::ImportService::PermissionError.new(message))
+          return false
         end
 
+        ::Projects::OverwriteProjectService.new(project, current_user)
+                                            .execute(project_to_overwrite)
+
         true
       end
 
@@ -137,5 +151,3 @@ module Gitlab
     end
   end
 end
-
-Gitlab::ImportExport::Importer.prepend_if_ee('EE::Gitlab::ImportExport::Importer')
diff --git a/lib/gitlab/import_export/project/base_task.rb b/lib/gitlab/import_export/project/base_task.rb
index 6a7b24421c9..356e261e251 100644
--- a/lib/gitlab/import_export/project/base_task.rb
+++ b/lib/gitlab/import_export/project/base_task.rb
@@ -11,17 +11,27 @@ module Gitlab
           @file_path    = opts.fetch(:file_path)
           @namespace    = Namespace.find_by_full_path(opts.fetch(:namespace_path))
           @current_user = User.find_by_username(opts.fetch(:username))
-          @measurement_enabled = opts.fetch(:measurement_enabled)
-          @measurement = Gitlab::Utils::Measuring.new(logger: logger) if @measurement_enabled
           @logger = logger
         end
 
         private
 
-        attr_reader :measurement, :project, :namespace, :current_user, :file_path, :project_path, :logger
+        attr_reader :project, :namespace, :current_user, :file_path, :project_path, :logger
 
-        def measurement_enabled?
-          @measurement_enabled
+        def disable_upload_object_storage
+          overwrite_uploads_setting('enabled', false) do
+            yield
+          end
+        end
+
+        def overwrite_uploads_setting(key, value)
+          old_value = Settings.uploads.object_store[key]
+          Settings.uploads.object_store[key] = value
+
+          yield
+
+        ensure
+          Settings.uploads.object_store[key] = old_value
         end
 
         def success(message)
diff --git a/lib/gitlab/import_export/project/export_task.rb b/lib/gitlab/import_export/project/export_task.rb
index ec287380c48..5e105b4653d 100644
--- a/lib/gitlab/import_export/project/export_task.rb
+++ b/lib/gitlab/import_export/project/export_task.rb
@@ -19,7 +19,11 @@ module Gitlab
               .execute(Gitlab::ImportExport::AfterExportStrategies::MoveFileStrategy.new(archive_path: file_path))
           end
 
+          return error(project.import_export_shared.errors.join(', ')) if project.import_export_shared.errors.any?
+
           success('Done!')
+        rescue Gitlab::ImportExport::Error => e
+          error(e.message)
         end
 
         private
@@ -32,8 +36,13 @@ module Gitlab
 
         def with_export
           with_request_store do
-            ::Gitlab::GitalyClient.allow_n_plus_1_calls do
-              measurement_enabled? ? measurement.with_measuring { yield } : yield
+            # We are disabling ObjectStorage for `export`
+            # since when direct upload is enabled, remote storage will be used
+            # and Gitlab::ImportExport::AfterExportStrategies::MoveFileStrategy will fail to copy exported archive
+            disable_upload_object_storage do
+              ::Gitlab::GitalyClient.allow_n_plus_1_calls do
+                yield
+              end
             end
           end
         end
diff --git a/lib/gitlab/import_export/project/import_export.yml b/lib/gitlab/import_export/project/import_export.yml
index 3cbd0d144e6..8851b106ad5 100644
--- a/lib/gitlab/import_export/project/import_export.yml
+++ b/lib/gitlab/import_export/project/import_export.yml
@@ -29,6 +29,14 @@ tree:
       - resource_label_events:
         - label:
           - :priorities
+      - designs:
+        - notes:
+          - :author
+          - events:
+            - :push_event_payload
+      - design_versions:
+        - actions:
+          - :design # Duplicate export of issues.designs in order to link the record to both Issue and Action
       - :issue_assignees
       - :zoom_meetings
       - :sentry_issue
@@ -160,6 +168,7 @@ excluded_attributes:
     - :marked_for_deletion_at
     - :marked_for_deletion_by_user_id
     - :compliance_framework_setting
+    - :show_default_award_emojis
   namespaces:
     - :runners_token
     - :runners_token_encrypted
@@ -190,6 +199,7 @@ excluded_attributes:
     - :merge_request_diff_id
   issues:
     - :milestone_id
+    - :sprint_id
     - :moved_to_id
     - :sent_notifications
     - :state_id
@@ -197,6 +207,7 @@ excluded_attributes:
     - :promoted_to_epic_id
   merge_request:
     - :milestone_id
+    - :sprint_id
     - :ref_fetched
     - :merge_jid
     - :rebase_jid
@@ -205,6 +216,7 @@ excluded_attributes:
     - :state_id
   merge_requests:
     - :milestone_id
+    - :sprint_id
     - :ref_fetched
     - :merge_jid
     - :rebase_jid
@@ -250,8 +262,9 @@ excluded_attributes:
     - :token
     - :token_encrypted
   services:
-    - :template
+    - :inherit_from_id
     - :instance
+    - :template
   error_tracking_setting:
     - :encrypted_token
     - :encrypted_token_iv
@@ -284,6 +297,7 @@ excluded_attributes:
   actions:
     - :design_id
     - :version_id
+    - image_v432x230
   links:
     - :release_id
   project_members:
@@ -376,14 +390,6 @@ ee:
   tree:
     project:
       - issues:
-        - designs:
-          - notes:
-            - :author
-            - events:
-              - :push_event_payload
-        - design_versions:
-          - actions:
-            - :design # Duplicate export of issues.designs in order to link the record to both Issue and Action
         - epic_issue:
           - :epic
       - protected_branches:
@@ -391,6 +397,3 @@ ee:
       - protected_environments:
         - :deploy_access_levels
       - :service_desk_setting
-  excluded_attributes:
-    actions:
-      - image_v432x230
diff --git a/lib/gitlab/import_export/project/import_task.rb b/lib/gitlab/import_export/project/import_task.rb
index ae654ddbeaf..59bb8af750e 100644
--- a/lib/gitlab/import_export/project/import_task.rb
+++ b/lib/gitlab/import_export/project/import_task.rb
@@ -32,7 +32,7 @@ module Gitlab
               # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24475#note_283090635
               # For development setups, this code-path will be excluded from n+1 detection.
               ::Gitlab::GitalyClient.allow_n_plus_1_calls do
-                measurement_enabled? ? measurement.with_measuring { yield } : yield
+                yield
               end
             end
 
@@ -56,11 +56,7 @@ module Gitlab
           disable_upload_object_storage do
             service = Projects::GitlabProjectsImportService.new(
               current_user,
-              {
-                namespace_id: namespace.id,
-                path:         project_path,
-                file:         File.open(file_path)
-              }
+              import_params
             )
 
             service.execute
@@ -71,24 +67,6 @@ module Gitlab
           Sidekiq::Worker.drain_all
         end
 
-        def disable_upload_object_storage
-          overwrite_uploads_setting('background_upload', false) do
-            overwrite_uploads_setting('direct_upload', false) do
-              yield
-            end
-          end
-        end
-
-        def overwrite_uploads_setting(key, value)
-          old_value = Settings.uploads.object_store[key]
-          Settings.uploads.object_store[key] = value
-
-          yield
-
-        ensure
-          Settings.uploads.object_store[key] = old_value
-        end
-
         def full_path
           "#{namespace.full_path}/#{project_path}"
         end
@@ -99,6 +77,14 @@ module Gitlab
             " as #{current_user.name}"
         end
 
+        def import_params
+          {
+            namespace_id: namespace.id,
+            path:         project_path,
+            file:         File.open(file_path)
+          }
+        end
+
         def show_import_failures_count
           return unless project.import_failures.exists?
 
diff --git a/lib/gitlab/import_export/project/object_builder.rb b/lib/gitlab/import_export/project/object_builder.rb
index c3637b1c115..831e38f3034 100644
--- a/lib/gitlab/import_export/project/object_builder.rb
+++ b/lib/gitlab/import_export/project/object_builder.rb
@@ -57,6 +57,8 @@ module Gitlab
 
         # Returns Arel clause for a particular model or `nil`.
         def where_clause_for_klass
+          return attrs_to_arel(attributes.slice('filename')).and(table[:issue_id].eq(nil)) if design?
+
           attrs_to_arel(attributes.slice('iid')) if merge_request?
         end
 
@@ -95,6 +97,10 @@ module Gitlab
           klass == Epic
         end
 
+        def design?
+          klass == DesignManagement::Design
+        end
+
         # If an existing group milestone used the IID
         # claim the IID back and set the group milestone to use one available
         # This is necessary to fix situations like the following:
@@ -115,5 +121,3 @@ module Gitlab
     end
   end
 end
-
-Gitlab::ImportExport::Project::ObjectBuilder.prepend_if_ee('EE::Gitlab::ImportExport::Project::ObjectBuilder')
diff --git a/lib/gitlab/import_export/project/relation_factory.rb b/lib/gitlab/import_export/project/relation_factory.rb
index f7f1195f2f1..3ab9f2c4bfa 100644
--- a/lib/gitlab/import_export/project/relation_factory.rb
+++ b/lib/gitlab/import_export/project/relation_factory.rb
@@ -4,8 +4,6 @@ module Gitlab
   module ImportExport
     module Project
       class RelationFactory < Base::RelationFactory
-        prepend_if_ee('::EE::Gitlab::ImportExport::Project::RelationFactory') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
         OVERRIDES = { snippets: :project_snippets,
                       ci_pipelines: 'Ci::Pipeline',
                       pipelines: 'Ci::Pipeline',
@@ -19,6 +17,10 @@ module Gitlab
                       merge_access_levels: 'ProtectedBranch::MergeAccessLevel',
                       push_access_levels: 'ProtectedBranch::PushAccessLevel',
                       create_access_levels: 'ProtectedTag::CreateAccessLevel',
+                      design: 'DesignManagement::Design',
+                      designs: 'DesignManagement::Design',
+                      design_versions: 'DesignManagement::Version',
+                      actions: 'DesignManagement::Action',
                       labels: :project_labels,
                       priorities: :label_priorities,
                       auto_devops: :project_auto_devops,
@@ -53,6 +55,7 @@ module Gitlab
           container_expiration_policy
           external_pull_request
           external_pull_requests
+          DesignManagement::Design
         ].freeze
 
         def create
@@ -161,3 +164,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::ImportExport::Project::RelationFactory.prepend_if_ee('::EE::Gitlab::ImportExport::Project::RelationFactory')
diff --git a/lib/gitlab/import_export/project/tree_restorer.rb b/lib/gitlab/import_export/project/tree_restorer.rb
index e9c89b803ba..a16ffe36054 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)
+          return unless Feature.enabled?(:project_import_ndjson, project.namespace, default_enabled: true)
 
           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 0017aa523c1..7cca3596da6 100644
--- a/lib/gitlab/import_export/project/tree_saver.rb
+++ b/lib/gitlab/import_export/project/tree_saver.rb
@@ -54,7 +54,7 @@ module Gitlab
 
         def json_writer
           @json_writer ||= begin
-            if ::Feature.enabled?(:project_export_as_ndjson, @project.namespace)
+            if ::Feature.enabled?(:project_export_as_ndjson, @project.namespace, default_enabled: true)
               full_path = File.join(@shared.export_path, 'tree')
               Gitlab::ImportExport::JSON::NdjsonWriter.new(full_path)
             else
diff --git a/lib/gitlab/import_export/relation_tree_restorer.rb b/lib/gitlab/import_export/relation_tree_restorer.rb
index 056945d0294..ea16d978127 100644
--- a/lib/gitlab/import_export/relation_tree_restorer.rb
+++ b/lib/gitlab/import_export/relation_tree_restorer.rb
@@ -37,9 +37,7 @@ module Gitlab
           ActiveRecord::Base.no_touching do
             update_params!
 
-            bulk_inserts_enabled = @importable.class == ::Project &&
-              Feature.enabled?(:import_bulk_inserts, @importable.group, default_enabled: true)
-            BulkInsertableAssociations.with_bulk_insert(enabled: bulk_inserts_enabled) do
+            BulkInsertableAssociations.with_bulk_insert(enabled: @importable.class == ::Project) do
               fix_ci_pipelines_not_sorted_on_legacy_project_json!
               create_relations!
             end
diff --git a/lib/gitlab/import_export/snippets_repo_restorer.rb b/lib/gitlab/import_export/snippets_repo_restorer.rb
index 8fe83225812..9ff3e74a6b1 100644
--- a/lib/gitlab/import_export/snippets_repo_restorer.rb
+++ b/lib/gitlab/import_export/snippets_repo_restorer.rb
@@ -10,7 +10,6 @@ module Gitlab
       end
 
       def restore
-        return true unless Feature.enabled?(:version_snippets, @user)
         return true unless Dir.exist?(snippets_repo_bundle_path)
 
         @project.snippets.find_each.all? do |snippet|
diff --git a/lib/gitlab/import_export/snippets_repo_saver.rb b/lib/gitlab/import_export/snippets_repo_saver.rb
index 85e094c0d15..d3b0fe1c18c 100644
--- a/lib/gitlab/import_export/snippets_repo_saver.rb
+++ b/lib/gitlab/import_export/snippets_repo_saver.rb
@@ -12,8 +12,6 @@ module Gitlab
       end
 
       def save
-        return true unless Feature.enabled?(:version_snippets, @current_user)
-
         create_snippets_repo_directory
 
         @project.snippets.find_each.all? do |snippet|