kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add cross-link to N+1 issue

Browse source 
[ci-skip]
This commit is contained in:
Jacob Vosmaer 2018-07-17 11:07:44 +02:00
parent 05b25f5a5f
commit e5854814f6
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/project.rb
View file

@ -2171,6 +2171,7 @@ class Project < ActiveRecord::Base
merge_requests = source_of_merge_requests.opened merge_requests = source_of_merge_requests.opened
.where(allow_collaboration: true) .where(allow_collaboration: true)
# Issue for N+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/49322
Gitlab::GitalyClient.allow_n_plus_1_calls do Gitlab::GitalyClient.allow_n_plus_1_calls do
if branch_name if branch_name
merge_requests.find_by(source_branch: branch_name)&.can_be_merged_by?(user) merge_requests.find_by(source_branch: branch_name)&.can_be_merged_by?(user)