Try to fence of gitaly n+1gitaly-mandatory-20180716-jv

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