diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-10-10 10:09:49 +0100 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-10-10 10:13:00 +0100 |
| commit | 5b32a4aaffc54c7ea9aca9e2745fcbcdbeae7a22 (patch) | |
| tree | 5e3b10e9a46ccf7b2256c24c9c7782565b953847 /app/workers/repository_import_worker.rb | |
| parent | 43b692cb4b43a476862fb6e7bf4c09edd6035077 (diff) | |
| download | gitlab-ce-5b32a4aaffc54c7ea9aca9e2745fcbcdbeae7a22.tar.gz | |
Backports EE 38771 changes to CE.
Diffstat (limited to 'app/workers/repository_import_worker.rb')
| -rw-r--r-- | app/workers/repository_import_worker.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |