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

Gitaly N+1 notice on Banzai filtering See merge request gitlab-org/gitlab-ce!17540
2018-03-06 21:03:48 +00:00 · 2018-03-06 21:03:48 +00:00 · 135ef03102
parent 35f6efaee0 2a5794a329
commit 135ef03102
1 changed files with 2 additions and 1 deletions
--- 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