diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-31 14:00:37 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-31 14:00:37 +0000 |
| commit | a0fc0fcc53edf316ca8190b93605d198e7de7a65 (patch) | |
| tree | 4ff75a0ecda5d2d01d1377a5a2a59f24a6ddb800 /app/models | |
| parent | 08e013431acb5238b4806260c4b9c304837097a3 (diff) | |
| parent | a6dbb85e978cb05255fd78de44d6f7b364f6dabc (diff) | |
| download | gitlab-ce-a0fc0fcc53edf316ca8190b93605d198e7de7a65.tar.gz | |
Merge branch 'rugged-reference-cache-rescue' into 'master'
Stop rescuing Rugged::Reference in Repository cache
See merge request gitlab-org/gitlab-ce!16770
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 406e3a7f73b..edfb236a91a 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -951,7 +951,7 @@ class Repository end instance_variable_set(ivar, value) - rescue Rugged::ReferenceError, Gitlab::Git::Repository::NoRepository + rescue Gitlab::Git::Repository::NoRepository # Even if the above `#exists?` check passes these errors might still # occur (for example because of a non-existing HEAD). We want to # gracefully handle this and not cache anything |