diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-31 01:39:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-31 01:39:58 +0300 |
| commit | c28c4810fce45479f83e82c7e170afb64083475e (patch) | |
| tree | ff99bc34ec18afe4ec1ca0a6581b540abdd926dc /app/models/project.rb | |
| parent | 4ae5799904509eb3688cde96342e6e2f5fe4f0dd (diff) | |
Add latest changes from gitlab-org/security/gitlab@13-8-stable-ee
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index ec790798806..a3f3e025e43 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -2666,7 +2666,7 @@ class Project < ApplicationRecord # Issue for N+1: https://gitlab.com/gitlab-org/gitlab-foss/issues/49322 Gitlab::GitalyClient.allow_n_plus_1_calls do merge_requests_allowing_collaboration(branch_name).any? do |merge_request| - merge_request.can_be_merged_by?(user) + merge_request.can_be_merged_by?(user, skip_collaboration_check: true) end end end |