diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-06-12 08:08:42 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-06-12 08:08:42 +0000 |
commit | e0de57a836c0661bcac1f5f72a87d9dd9c115c9c (patch) | |
tree | 7bc1638eded832dd8e69664d09783477836a6329 /spec/models/project_spec.rb | |
parent | 8e7ebd537bcc406756fe059ac89d51bbefe40d6b (diff) | |
parent | 698515313fe38fb3f85fdeec1efa15e2c8b54cfd (diff) | |
download | gitlab-ce-e0de57a836c0661bcac1f5f72a87d9dd9c115c9c.tar.gz |
Merge branch 'bvl-fix-maintainer-push-rejected' into 'master'
Fixes rejected pushes from maintainers
Closes #46337
See merge request gitlab-org/gitlab-ce!18968
Diffstat (limited to 'spec/models/project_spec.rb')
-rw-r--r-- | spec/models/project_spec.rb | 5 |
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) |