diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-30 22:40:10 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-30 22:40:10 +0000 |
commit | b8cacd68a6297f2c6cdd454a3d82a487367f2e70 (patch) | |
tree | 093014d689cb2c662f8f3f112791d952263a3b1a /app/models | |
parent | b2ce3643e27db4cc0ad30cc09d651c00ec799887 (diff) | |
download | gitlab-ce-b8cacd68a6297f2c6cdd454a3d82a487367f2e70.tar.gz |
Add latest changes from gitlab-org/security/gitlab@13-10-stable-ee
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/merge_request.rb | 4 | ||||
-rw-r--r-- | app/models/project.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index ac50e5c5107..7efdd79ae1c 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1337,8 +1337,8 @@ class MergeRequest < ApplicationRecord has_no_commits? || branch_missing? || cannot_be_merged? end - def can_be_merged_by?(user) - access = ::Gitlab::UserAccess.new(user, container: project) + def can_be_merged_by?(user, skip_collaboration_check: false) + access = ::Gitlab::UserAccess.new(user, container: project, skip_collaboration_check: skip_collaboration_check) access.can_update_branch?(target_branch) end diff --git a/app/models/project.rb b/app/models/project.rb index 274dae8fd65..c52eb95bde8 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -2704,7 +2704,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 |