Commit aaeec1c1 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'gitaly-issue-cross-reference' into 'master'

Add cross-link to N+1 issue

See merge request gitlab-org/gitlab-ce!20663
parents a9b119d0 e5854814
......@@ -2171,6 +2171,7 @@ class Project < ActiveRecord::Base
merge_requests = source_of_merge_requests.opened
.where(allow_collaboration: true)
# Issue for N+1:
Gitlab::GitalyClient.allow_n_plus_1_calls do
if branch_name
merge_requests.find_by(source_branch: branch_name)&.can_be_merged_by?(user)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment