summaryrefslogtreecommitdiff
path: root/app/workers/project_import_worker.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/workers/project_import_worker.rb')
-rw-r--r--app/workers/project_import_worker.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/app/workers/project_import_worker.rb b/app/workers/project_import_worker.rb
index 6dd514b56a0..0e8b9552442 100644
--- a/app/workers/project_import_worker.rb
+++ b/app/workers/project_import_worker.rb
@@ -2,12 +2,15 @@ class ProjectImportWorker
include Sidekiq::Worker
include Gitlab::ShellAdapter
- sidekiq_options queue: :gitlab_shell
+ sidekiq_options queue: :gitlab_shell, retry: false
- def perform(current_user_id, tmp_file)
+ def perform(current_user_id, tmp_file, namespace_id, path)
current_user = User.find(current_user_id)
- project = Gitlab::ImportExport::ImportService.execute(archive_file: tmp_file, owner: current_user)
+ project = Gitlab::ImportExport::ImportService.execute(archive_file: tmp_file,
+ owner: current_user,
+ namespace_id: namespace_id,
+ project_path: path)
# TODO: Move this to import service
# if result[:status] == :error