diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 18:38:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 18:38:24 +0000 |
| commit | 983a0bba5d2a042c4a3bbb22432ec192c7501d82 (patch) | |
| tree | b153cd387c14ba23bd5a07514c7c01fddf6a78a0 /app/services/groups/import_export/import_service.rb | |
| parent | a2bddee2cdb38673df0e004d5b32d9f77797de64 (diff) | |
| download | gitlab-ce-983a0bba5d2a042c4a3bbb22432ec192c7501d82.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'app/services/groups/import_export/import_service.rb')
| -rw-r--r-- | app/services/groups/import_export/import_service.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/services/groups/import_export/import_service.rb b/app/services/groups/import_export/import_service.rb index 548a4a98dc1..f62b9d3c8a6 100644 --- a/app/services/groups/import_export/import_service.rb +++ b/app/services/groups/import_export/import_service.rb @@ -33,10 +33,12 @@ module Groups end def restorer - @restorer ||= Gitlab::ImportExport::Group::TreeRestorer.new(user: @current_user, - shared: @shared, - group: @group, - group_hash: nil) + @restorer ||= Gitlab::ImportExport::Group::LegacyTreeRestorer.new( + user: @current_user, + shared: @shared, + group: @group, + group_hash: nil + ) end def remove_import_file |