Merge branch 'bvl-fix-maintainer-push-rejected' into 'master'

Fixes rejected pushes from maintainers

Closes #46337

See merge request gitlab-org/gitlab-ce!18968

1 files changed, 5 insertions, 0 deletions

diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 926365e409a..585cf7aab44 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -3663,6 +3663,11 @@ describe Project do
           .to be_truthy
       end
 
+      it 'allows access when there are merge requests open but no branch name is given' do
+        expect(project.branch_allows_collaboration?(user, nil))
+          .to be_truthy
+      end
+
       it 'does not allow guest users access' do
         guest = create(:user)
         target_project.add_guest(guest)