diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-06 20:44:38 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-06 20:44:38 +0900 |
| commit | 377916ed72cf31ee31e463f395993d1ec0dc579b (patch) | |
| tree | 89f2e9ce00777a8c13ef74f8e50540274c73c41c /app/services | |
| parent | eba27fe022562e6e5cdae81a08addff6ec152826 (diff) | |
| parent | d4ceec9d47a7da5fa17cb6e161ac491e13fcb8bd (diff) | |
| download | gitlab-ce-377916ed72cf31ee31e463f395993d1ec0dc579b.tar.gz | |
Merge branch 'master' into refactor-clusters
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/projects/import_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb index c3bf0031409..455b302d819 100644 --- a/app/services/projects/import_service.rb +++ b/app/services/projects/import_service.rb @@ -44,7 +44,7 @@ module Projects else clone_repository end - rescue Gitlab::Shell::Error => e + rescue Gitlab::Shell::Error, Gitlab::Git::RepositoryMirroring::RemoteError => e # Expire cache to prevent scenarios such as: # 1. First import failed, but the repo was imported successfully, so +exists?+ returns true # 2. Retried import, repo is broken or not imported but +exists?+ still returns true |