diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-15 00:08:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-15 00:08:43 +0000 |
| commit | 45ccc5610c9afec64de3c4894789896ee2d5c48d (patch) | |
| tree | 544b5e40167eca28e075cec24d4736283620b88e /app/workers | |
| parent | 6b4c082fc8f266aa796595103e6c5f6ddb199280 (diff) | |
| download | gitlab-ce-45ccc5610c9afec64de3c4894789896ee2d5c48d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/group_import_worker.rb | 9 |
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 |