Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/bulk_imports/file_transfer')
-rw-r--r--app/models/bulk_imports/file_transfer/base_config.rb6
-rw-r--r--app/models/bulk_imports/file_transfer/group_config.rb4
-rw-r--r--app/models/bulk_imports/file_transfer/project_config.rb4
3 files changed, 13 insertions, 1 deletions
diff --git a/app/models/bulk_imports/file_transfer/base_config.rb b/app/models/bulk_imports/file_transfer/base_config.rb
index 7396f9d3655..ddea7c3f64c 100644
--- a/app/models/bulk_imports/file_transfer/base_config.rb
+++ b/app/models/bulk_imports/file_transfer/base_config.rb
@@ -30,7 +30,7 @@ module BulkImports
end
def portable_relations
- import_export_config.dig(:tree, portable_class_sym).keys.map(&:to_s)
+ import_export_config.dig(:tree, portable_class_sym).keys.map(&:to_s) - skipped_relations
end
private
@@ -66,6 +66,10 @@ module BulkImports
def base_export_path
raise NotImplementedError
end
+
+ def skipped_relations
+ []
+ end
end
end
end
diff --git a/app/models/bulk_imports/file_transfer/group_config.rb b/app/models/bulk_imports/file_transfer/group_config.rb
index 1f845b387b8..2266cbb484f 100644
--- a/app/models/bulk_imports/file_transfer/group_config.rb
+++ b/app/models/bulk_imports/file_transfer/group_config.rb
@@ -10,6 +10,10 @@ module BulkImports
def import_export_yaml
::Gitlab::ImportExport.group_config_file
end
+
+ def skipped_relations
+ @skipped_relations ||= %w(members)
+ end
end
end
end
diff --git a/app/models/bulk_imports/file_transfer/project_config.rb b/app/models/bulk_imports/file_transfer/project_config.rb
index e42b5bfce3d..8a57f51c1c5 100644
--- a/app/models/bulk_imports/file_transfer/project_config.rb
+++ b/app/models/bulk_imports/file_transfer/project_config.rb
@@ -10,6 +10,10 @@ module BulkImports
def import_export_yaml
::Gitlab::ImportExport.config_file
end
+
+ def skipped_relations
+ @skipped_relations ||= %w(project_members group_members)
+ end
end
end
end