Merge branch 'avatar_n_plus_one' into 'master'

Allow n+1s caused by avatar fetches on the project dashboard. See…

See merge request gitlab-org/gitlab-ce!14475
This commit is contained in:
Rémy Coutable 2017-09-26 17:06:49 +00:00
commit 3b2d68d37d
1 changed files with 5 additions and 2 deletions

View File

@ -534,8 +534,11 @@ class Repository
cache_method :tag_count, fallback: 0
def avatar
if tree = file_on_head(:avatar)
tree.path
# n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/38327
Gitlab::GitalyClient.allow_n_plus_1_calls do
if tree = file_on_head(:avatar)
tree.path
end
end
end
cache_method :avatar