diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2017-09-19 10:55:37 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-19 10:55:37 +0000 |
| commit | 64d7ec0a9e3ffd6233ccfbe9100f8a9391c648e5 (patch) | |
| tree | 2cc89bc2d1087eb145918c6ae8cbf70878d40e97 /lib/api | |
| parent | 39dd7736585d3e35d5c6f391e6a94c312da09056 (diff) | |
| download | gitlab-ce-64d7ec0a9e3ffd6233ccfbe9100f8a9391c648e5.tar.gz | |
Detect n+1 issues involving Gitaly
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/branches.rb | 5 | ||||
| -rw-r--r-- | lib/api/entities.rb | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/api/branches.rb b/lib/api/branches.rb index 642c1140fcc..643c8e6fb8e 100644 --- a/lib/api/branches.rb +++ b/lib/api/branches.rb @@ -21,7 +21,10 @@ module API get ':id/repository/branches' do branches = ::Kaminari.paginate_array(user_project.repository.branches.sort_by(&:name)) - present paginate(branches), with: Entities::RepoBranch, project: user_project + # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37442 + Gitlab::GitalyClient.allow_n_plus_1_calls do + present paginate(branches), with: Entities::RepoBranch, project: user_project + end end resource ':id/repository/branches/:branch', requirements: BRANCH_ENDPOINT_REQUIREMENTS do 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| |