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 'lib/bulk_imports/groups/stage.rb')
-rw-r--r--lib/bulk_imports/groups/stage.rb11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/bulk_imports/groups/stage.rb b/lib/bulk_imports/groups/stage.rb
index 1cdd3bb1d65..bc9d490162c 100644
--- a/lib/bulk_imports/groups/stage.rb
+++ b/lib/bulk_imports/groups/stage.rb
@@ -19,6 +19,8 @@ module BulkImports
# `maximum_source_version` is equal to 15.1.0, the pipeline will be executed when importing from source instances
# running versions 15.1.1 (patch), 15.1.0, 15.0.1, 15.0.0, 14.10.0, etc. And it won't be executed when the source
# instance version is 15.2.0, 15.2.1, 16.0.0, etc.
+ #
+ # SubGroup Entities must be imported in later stage than Project Entities to avoid `full_path` naming conflicts.
def config
{
@@ -30,10 +32,6 @@ module BulkImports
pipeline: BulkImports::Groups::Pipelines::GroupAttributesPipeline,
stage: 1
},
- subgroups: {
- pipeline: BulkImports::Groups::Pipelines::SubgroupEntitiesPipeline,
- stage: 1
- },
namespace_settings: {
pipeline: BulkImports::Groups::Pipelines::NamespaceSettingsPipeline,
stage: 1,
@@ -55,6 +53,11 @@ module BulkImports
pipeline: BulkImports::Common::Pipelines::BadgesPipeline,
stage: 1
},
+ subgroups: {
+ pipeline: BulkImports::Groups::Pipelines::SubgroupEntitiesPipeline,
+ stage: 2 # SubGroup Entities must be imported in later stage
+ # to Project Entities to avoid `full_path` naming conflicts.
+ },
boards: {
pipeline: BulkImports::Common::Pipelines::BoardsPipeline,
stage: 2