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

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
3b2d68d3 · Rémy Coutable · dfccc8d7 · e4b69bc2 · 3b2d68d3
Commit 3b2d68d3 authored Sep 26, 2017 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

app/models/repository.rb app/models/repository.rb +5 -2

No files found.
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -534,10 +534,13 @@ class Repository
  cache_method :tag_count, fallback: 0
  def avatar
+    # 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
  def readme