diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 18:09:24 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 18:09:24 +0000 |
commit | 619d0b6922a6cf95d291fbbf5fa3d09e772a1ea8 (patch) | |
tree | fb8f8e036cec1b32166206bb5102af6c5dca8cfe /app/services/groups/import_export | |
parent | 17ab40ca089e1aef61a83f77ab6df62a72f6ce06 (diff) | |
download | gitlab-ce-619d0b6922a6cf95d291fbbf5fa3d09e772a1ea8.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/groups/import_export')
-rw-r--r-- | app/services/groups/import_export/export_service.rb | 16 | ||||
-rw-r--r-- | app/services/groups/import_export/import_service.rb | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/services/groups/import_export/export_service.rb b/app/services/groups/import_export/export_service.rb index 2c3975961a8..aa484e7203c 100644 --- a/app/services/groups/import_export/export_service.rb +++ b/app/services/groups/import_export/export_service.rb @@ -18,6 +18,8 @@ module Groups end save! + ensure + cleanup end private @@ -28,7 +30,7 @@ module Groups if savers.all?(&:save) notify_success else - cleanup_and_notify_error! + notify_error! end end @@ -37,21 +39,19 @@ module Groups end def tree_exporter - Gitlab::ImportExport::GroupTreeSaver.new(group: @group, current_user: @current_user, shared: @shared, params: @params) + Gitlab::ImportExport::Group::TreeSaver.new(group: @group, current_user: @current_user, shared: @shared, params: @params) end def file_saver Gitlab::ImportExport::Saver.new(exportable: @group, shared: @shared) end - def cleanup_and_notify_error - FileUtils.rm_rf(shared.export_path) - - notify_error + def cleanup + FileUtils.rm_rf(shared.archive_path) if shared&.archive_path end - def cleanup_and_notify_error! - cleanup_and_notify_error + def notify_error! + notify_error raise Gitlab::ImportExport::Error.new(shared.errors.to_sentence) end diff --git a/app/services/groups/import_export/import_service.rb b/app/services/groups/import_export/import_service.rb index 628c8f5bac0..57d2d9855d1 100644 --- a/app/services/groups/import_export/import_service.rb +++ b/app/services/groups/import_export/import_service.rb @@ -34,7 +34,7 @@ module Groups end def restorer - @restorer ||= Gitlab::ImportExport::GroupTreeRestorer.new(user: @current_user, + @restorer ||= Gitlab::ImportExport::Group::TreeRestorer.new(user: @current_user, shared: @shared, group: @group, group_hash: nil) |