diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 12:10:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 12:10:17 +0300 |
| commit | ad0265eead72a624ce7a020847db4f0f0c877e57 (patch) | |
| tree | 206e0564b02aa9530e3c95f70eb10a77e074bdf0 /lib/gitlab/import_export | |
| parent | 4dfc8711171fe0c04bc6b8b224687603026dea46 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/import_export')
| -rw-r--r-- | lib/gitlab/import_export/project/tree_restorer.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/gitlab/import_export/project/tree_restorer.rb b/lib/gitlab/import_export/project/tree_restorer.rb index ad3720b56be..e9c89b803ba 100644 --- a/lib/gitlab/import_export/project/tree_restorer.rb +++ b/lib/gitlab/import_export/project/tree_restorer.rb @@ -25,6 +25,11 @@ module Gitlab @project_members = relation_reader.consume_relation(importable_path, 'project_members') .map(&:first) + # ensure users are mapped before tree restoration + # so that even if there is no content to associate + # users with, they are still added to the project + members_mapper.map + if relation_tree_restorer.restore import_failure_service.with_retry(action: 'set_latest_merge_request_diff_ids!') do @project.merge_requests.set_latest_merge_request_diff_ids! |