From ae1efa2e1d32dee59d8f509ba17b623b5ffe4ba6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 1 Jul 2020 15:08:45 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/workers/repository_import_worker.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/workers/repository_import_worker.rb') diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb index 30570a2227e..54052bda675 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -4,10 +4,11 @@ class RepositoryImportWorker # rubocop:disable Scalability/IdempotentWorker include ApplicationWorker include ExceptionBacktrace include ProjectStartImport - include ProjectImportOptions feature_category :importers worker_has_external_dependencies! + sidekiq_options retry: false + sidekiq_options status_expiration: Gitlab::Import::StuckImportJob::IMPORT_JOBS_EXPIRATION # technical debt: https://gitlab.com/gitlab-org/gitlab/issues/33991 sidekiq_options memory_killer_memory_growth_kb: ENV.fetch('MEMORY_KILLER_REPOSITORY_IMPORT_WORKER_MEMORY_GROWTH_KB', 50).to_i -- cgit v1.2.3