From 64d7ec0a9e3ffd6233ccfbe9100f8a9391c648e5 Mon Sep 17 00:00:00 2001 From: Andrew Newdigate Date: Tue, 19 Sep 2017 10:55:37 +0000 Subject: Detect n+1 issues involving Gitaly --- lib/api/entities.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/api/entities.rb') diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 30b115b1b56..71253f72533 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -244,7 +244,10 @@ module API end expose :merged do |repo_branch, options| - options[:project].repository.merged_to_root_ref?(repo_branch.name) + # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37442 + Gitlab::GitalyClient.allow_n_plus_1_calls do + options[:project].repository.merged_to_root_ref?(repo_branch.name) + end end expose :protected do |repo_branch, options| -- cgit v1.2.3