Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 10 insertions, 1 deletions

diff --git a/app/workers/group_import_worker.rb b/app/workers/group_import_worker.rb
index b6fc5afc28c..d8f236013bf 100644
--- a/app/workers/group_import_worker.rb
+++ b/app/workers/group_import_worker.rb
@@ -2,14 +2,23 @@
 
 class GroupImportWorker # rubocop:disable Scalability/IdempotentWorker
   include ApplicationWorker
-  include ExceptionBacktrace
 
+  sidekiq_options retry: false
   feature_category :importers
 
   def perform(user_id, group_id)
     current_user = User.find(user_id)
     group = Group.find(group_id)
+    group_import = group.build_import_state(jid: self.jid)
+
+    group_import.start!
 
     ::Groups::ImportExport::ImportService.new(group: group, user: current_user).execute
+
+    group_import.finish!
+  rescue StandardError => e
+    group_import&.fail_op(e.message)
+
+    raise e
   end
 end