From 5b32a4aaffc54c7ea9aca9e2745fcbcdbeae7a22 Mon Sep 17 00:00:00 2001 From: Tiago Botelho Date: Tue, 10 Oct 2017 10:09:49 +0100 Subject: Backports EE 38771 changes to CE. --- 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 00a021abbdc..d7c0043d3b6 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -4,6 +4,7 @@ class RepositoryImportWorker include Sidekiq::Worker include DedicatedSidekiqQueue include ExceptionBacktrace + include ProjectStartImport sidekiq_options status_expiration: StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION @@ -34,7 +35,7 @@ class RepositoryImportWorker private def start_import(project) - return true if project.import_start + return true if start(project) Rails.logger.info("Project #{project.full_path} was in inconsistent state (#{project.import_status}) while importing.") false -- cgit v1.2.1