Merge branch 'banzai-n-plus-one' into 'master'

Gitaly N+1 notice on Banzai filtering See merge request gitlab-org/gitlab-ce!17540

Merge branch 'banzai-n-plus-one' into 'master'
135ef031 · Douwe Maan · 35f6efae · 2a5794a3 · 135ef031
Commit 135ef031 authored Mar 06, 2018 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

commit_reference_filter.rb lib/banzai/filter/commit_reference_filter.rb +2 -1

No files found.
--- a/lib/banzai/filter/commit_reference_filter.rb
+++ b/lib/banzai/filter/commit_reference_filter.rb
@@ -18,7 +18,8 @@ module Banzai

      def find_object(project, id)
        if project && project.valid_repo?
-          project.commit(id)
+          # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/43894
+          Gitlab::GitalyClient.allow_n_plus_1_calls { project.commit(id) }
        end
      end