diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-09-25 13:04:56 +0000 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-09-25 13:04:56 +0000 |
commit | b55f8aebab4ceec157ba38d981fe68b4dd688346 (patch) | |
tree | 8648ccdb57cda3bb04b7b020eefa2780b1abde72 /lib | |
parent | 959386eb0c11c1a4f71faf1eff8ea837b13a4c0d (diff) | |
parent | 6691194af979d87b9afca7c053af438c904f4af9 (diff) | |
download | gitlab-ce-b55f8aebab4ceec157ba38d981fe68b4dd688346.tar.gz |
Merge branch '51747-gitlab-com-unable-to-import-a-project-that-was-just-exported' into 'master'
Resolve "gitlab.com: Unable to import a project that was just exported"
Closes #43840, #43896, and #51747
See merge request gitlab-org/gitlab-ce!21875
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/import_export/project_tree_restorer.rb | 15 | ||||
-rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 3 |
2 files changed, 16 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/project_tree_restorer.rb b/lib/gitlab/import_export/project_tree_restorer.rb index 00ea4b833e2..3d693d23c99 100644 --- a/lib/gitlab/import_export/project_tree_restorer.rb +++ b/lib/gitlab/import_export/project_tree_restorer.rb @@ -136,9 +136,18 @@ module Gitlab return if tree_hash[relation_key].blank? tree_array = [tree_hash[relation_key]].flatten + null_iid_pipelines = [] # Avoid keeping a possible heavy object in memory once we are done with it - while relation_item = tree_array.shift + while relation_item = (tree_array.shift || null_iid_pipelines.shift) + if nil_iid_pipeline?(relation_key, relation_item) && tree_array.any? + # Move pipelines with NULL IIDs to the end + # so they don't clash with existing IIDs. + null_iid_pipelines << relation_item + + next + end + # The transaction at this level is less speedy than one single transaction # But we can't have it in the upper level or GC won't get rid of the AR objects # after we save the batch. @@ -201,6 +210,10 @@ module Gitlab def excluded_keys_for_relation(relation) reader.attributes_finder.find_excluded_keys(relation) end + + def nil_iid_pipeline?(relation_key, relation_item) + relation_key == 'pipelines' && relation_item['iid'].nil? + end end end end diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index 81807ed659c..2486b1e4921 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -86,7 +86,6 @@ module Gitlab case @relation_name when :merge_request_diff_files then setup_diff when :notes then setup_note - when 'Ci::Pipeline' then setup_pipeline end update_user_references @@ -94,6 +93,8 @@ module Gitlab update_group_references remove_duplicate_assignees + setup_pipeline if @relation_name == 'Ci::Pipeline' + reset_tokens! remove_encrypted_attributes! end |