From a9ced7da447785c57477b3d8dbccc73a78cface1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 9 Apr 2020 12:09:24 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- lib/api/group_export.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/api/group_export.rb') diff --git a/lib/api/group_export.rb b/lib/api/group_export.rb index 6fe72458da2..8ca5dfa082e 100644 --- a/lib/api/group_export.rb +++ b/lib/api/group_export.rb @@ -27,9 +27,13 @@ module API detail 'This feature was introduced in GitLab 12.5.' end post ':id/export' do - GroupExportWorker.perform_async(current_user.id, user_group.id, params) # rubocop:disable CodeReuse/Worker + export_service = ::Groups::ImportExport::ExportService.new(group: user_group, user: current_user) - accepted! + if export_service.async_execute + accepted! + else + render_api_error!(message: 'Group export could not be started.') + end end end end -- cgit v1.2.3