diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-13 15:07:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-13 15:07:54 +0300 |
| commit | 41e8b05e8d06f4b13a984e4a3ad26e9a48294543 (patch) | |
| tree | 833a6ca2518dab3923f0ffbc760d9ba241cab196 /app/workers/project_export_worker.rb | |
| parent | 0e65189f85bb393e16e60335a42933beb0834295 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers/project_export_worker.rb')
| -rw-r--r-- | app/workers/project_export_worker.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/project_export_worker.rb b/app/workers/project_export_worker.rb index fd3408bc13a..a287c511a65 100644 --- a/app/workers/project_export_worker.rb +++ b/app/workers/project_export_worker.rb @@ -9,7 +9,7 @@ class ProjectExportWorker # rubocop:disable Scalability/IdempotentWorker worker_resource_boundary :memory urgency :throttled - def perform(current_user_id, project_id, after_export_strategy = {}, params = {}, options = {}) + def perform(current_user_id, project_id, after_export_strategy = {}, params = {}) current_user = User.find(current_user_id) project = Project.find(project_id) export_job = project.export_jobs.safe_find_or_create_by(jid: self.jid) @@ -17,7 +17,7 @@ class ProjectExportWorker # rubocop:disable Scalability/IdempotentWorker export_job&.start - ::Projects::ImportExport::ExportService.new(project, current_user, params).execute(after_export, options) + ::Projects::ImportExport::ExportService.new(project, current_user, params).execute(after_export) export_job&.finish rescue ActiveRecord::RecordNotFound, Gitlab::ImportExport::AfterExportStrategyBuilder::StrategyNotFoundError => e |