diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-06 10:39:36 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-06 10:39:36 +0000 |
| commit | d4ceec9d47a7da5fa17cb6e161ac491e13fcb8bd (patch) | |
| tree | 2e7170aed7ea79da51f7693eeda32e8cc29fcc43 /app/services | |
| parent | 46dc343f605f0c98d2b9ec44617d313a1548b4e2 (diff) | |
| parent | fe4874c43d3387aed52d95bc2892b27e551ac7a9 (diff) | |
| download | gitlab-ce-d4ceec9d47a7da5fa17cb6e161ac491e13fcb8bd.tar.gz | |
Merge branch 'ce-gitlab-git-backport' into 'master'
CE repository mirroring changes backport
See merge request gitlab-org/gitlab-ce!15184
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 |