diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-12 12:09:56 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-12 12:09:56 +0000 |
| commit | 6e78508cd2021fd2dd69c786f58be15a21748748 (patch) | |
| tree | 8a3e0cbb777355da89c40e9f803b2d123a75383e /spec/features | |
| parent | 2a8686353a507d52c3d0c04da66bd05f62e43226 (diff) | |
| parent | 4dd2195004c63a63c67dfadb55097af1857df7b9 (diff) | |
| download | gitlab-ce-6e78508cd2021fd2dd69c786f58be15a21748748.tar.gz | |
Merge branch 'protected-branches-no-one-merge' into 'master'
Enabled 'no one' as a merge access level in protected branches
Closes #31541
See merge request !11232
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/protected_branches/access_control_ce_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/protected_branches/access_control_ce_spec.rb b/spec/features/protected_branches/access_control_ce_spec.rb index d30e7947106..7fda4ade665 100644 --- a/spec/features/protected_branches/access_control_ce_spec.rb +++ b/spec/features/protected_branches/access_control_ce_spec.rb @@ -31,7 +31,7 @@ RSpec.shared_examples "protected branches > access control > CE" do within(".protected-branches-list") do find(".js-allowed-to-push").click - + within('.js-allowed-to-push-container') do expect(first("li")).to have_content("Roles") click_on access_type_name |