Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/workers/group_import_worker.rb')
-rw-r--r--app/workers/group_import_worker.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/app/workers/group_import_worker.rb b/app/workers/group_import_worker.rb
index d8f236013bf..36d81468d55 100644
--- a/app/workers/group_import_worker.rb
+++ b/app/workers/group_import_worker.rb
@@ -9,15 +9,16 @@ class GroupImportWorker # rubocop:disable Scalability/IdempotentWorker
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_state = group.import_state || group.build_import_state
- group_import.start!
+ group_import_state.jid = self.jid
+ group_import_state.start!
::Groups::ImportExport::ImportService.new(group: group, user: current_user).execute
- group_import.finish!
+ group_import_state.finish!
rescue StandardError => e
- group_import&.fail_op(e.message)
+ group_import_state&.fail_op(e.message)
raise e
end