diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-28 18:10:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-28 18:10:01 +0000 |
| commit | f14814c9815f86a95808f089ff219d4e768641c0 (patch) | |
| tree | bca9f6f2719c693748479776b766786922b026e2 /app/models/container_repository.rb | |
| parent | f7f0c0502763777f48964774a87b0a34dfb1d9ab (diff) | |
| download | gitlab-ce-f14814c9815f86a95808f089ff219d4e768641c0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/container_repository.rb')
| -rw-r--r-- | app/models/container_repository.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb index 92f0b978788..331902ba101 100644 --- a/app/models/container_repository.rb +++ b/app/models/container_repository.rb @@ -326,17 +326,13 @@ class ContainerRepository < ApplicationRecord return if importing? start_import(forced: true) - when 'import_canceled', 'pre_import_canceled' - return if import_skipped? - - skip_import(reason: :migration_canceled_by_registry) when 'import_complete' finish_import - when 'import_failed' + when 'import_failed', 'import_canceled' retry_import when 'pre_import_complete' finish_pre_import_and_start_import - when 'pre_import_failed' + when 'pre_import_failed', 'pre_import_canceled' retry_pre_import else yield |