diff options
author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-07-17 12:00:32 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-17 12:00:32 +0300 |
commit | 830940f422bb09abcf2eb0f321d1e4a1bc41d018 (patch) | |
tree | 2522959504ef398aa492256a61821e354421da20 /app/models/project.rb | |
parent | c093193b1adfae58c538c7bb0cea8a641cf8ad31 (diff) |
Migrate merge base, merged branches, write ref
Diffstat (limited to 'app/models/project.rb')
-rw-r--r-- | app/models/project.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index e29bca365a4..4b57aa0242f 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -2171,10 +2171,12 @@ class Project < ActiveRecord::Base merge_requests = source_of_merge_requests.opened .where(allow_collaboration: true) - if branch_name - merge_requests.find_by(source_branch: branch_name)&.can_be_merged_by?(user) - else - merge_requests.any? { |merge_request| merge_request.can_be_merged_by?(user) } + Gitlab::GitalyClient.allow_n_plus_1_calls do + if branch_name + merge_requests.find_by(source_branch: branch_name)&.can_be_merged_by?(user) + else + merge_requests.any? { |merge_request| merge_request.can_be_merged_by?(user) } + end end end |