diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-05-02 14:35:04 +0100 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-05-04 17:33:26 +0200 |
| commit | bddbcaefc2389e4c61763472cecbea150f10cd75 (patch) | |
| tree | 38ba599beed53505dfca09fce7a890bf3b125bb3 /lib/gitlab/github_import | |
| parent | 7603beffc916d06039cac63b223d8e6234b5d666 (diff) | |
| download | gitlab-ce-bddbcaefc2389e4c61763472cecbea150f10cd75.tar.gz | |
Backports every CE related change from ee-44542 to CE
Diffstat (limited to 'lib/gitlab/github_import')
| -rw-r--r-- | lib/gitlab/github_import/parallel_importer.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/github_import/parallel_importer.rb b/lib/gitlab/github_import/parallel_importer.rb index 6da11e6ef08..b02b123c98e 100644 --- a/lib/gitlab/github_import/parallel_importer.rb +++ b/lib/gitlab/github_import/parallel_importer.rb @@ -32,7 +32,8 @@ module Gitlab Gitlab::SidekiqStatus .set(jid, StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION) - project.update_column(:import_jid, jid) + project.ensure_import_state + project.import_state&.update_column(:jid, jid) Stage::ImportRepositoryWorker .perform_async(project.id) |