diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-03-27 00:21:57 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-03-27 00:21:57 +0000 |
| commit | c1834664a7a29a32551291102265ece978c55ffe (patch) | |
| tree | a884cce1fb71d495debc0c0371604be6df88bc69 /app/models | |
| parent | 8034e1a154aa355b8a212cc48acddf0401d414ce (diff) | |
| parent | 506878970b2040be7446fc1a341d7abc61f9c6ec (diff) | |
| download | gitlab-ce-c1834664a7a29a32551291102265ece978c55ffe.tar.gz | |
Merge branch 'handle-avatar-in-empty-repo' into 'master'
Don't attempt to look up an avatar in repo if repo directory does not exist
Relates to https://sentry.gitlap.com/gitlab/gitlabcom/issues/3507/
Closes #14580
See merge request !3390
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 908d765fb47..c07e8072043 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -889,6 +889,8 @@ class Repository end def avatar + return nil unless exists? + @avatar ||= cache.fetch(:avatar) do AVATAR_FILES.find do |file| blob_at_branch('master', file) |