From 7f305b576b51c3503970ef224cf4b31e247a322d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 30 Apr 2020 15:09:46 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/workers/project_export_worker.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/workers/project_export_worker.rb') diff --git a/app/workers/project_export_worker.rb b/app/workers/project_export_worker.rb index a287c511a65..fd3408bc13a 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 = {}) + def perform(current_user_id, project_id, after_export_strategy = {}, params = {}, options = {}) 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) + ::Projects::ImportExport::ExportService.new(project, current_user, params).execute(after_export, options) export_job&.finish rescue ActiveRecord::RecordNotFound, Gitlab::ImportExport::AfterExportStrategyBuilder::StrategyNotFoundError => e -- cgit v1.2.3