summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-03-06 21:03:48 +0000
committerDouwe Maan <douwe@gitlab.com>2018-03-06 21:03:48 +0000
commit135ef031024ea95d3dc014c5f0ef46983372f2f3 (patch)
tree58c861c8019a1442facbee9e2d1e5ccb70f23f8e
parent35f6efaee05835b75e605e1f269e57a8d6daf3fa (diff)
parent2a5794a3297f7e3d8b07fbd8037978ae57268945 (diff)
downloadgitlab-ce-135ef031024ea95d3dc014c5f0ef46983372f2f3.tar.gz
Merge branch 'banzai-n-plus-one' into 'master'
Gitaly N+1 notice on Banzai filtering See merge request gitlab-org/gitlab-ce!17540
-rw-r--r--lib/banzai/filter/commit_reference_filter.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/banzai/filter/commit_reference_filter.rb b/lib/banzai/filter/commit_reference_filter.rb
index eedb95197aa..43bf4fc6565 100644
--- 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