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/models | |
| 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/models')
| -rw-r--r-- | spec/models/protected_branch/merge_access_level_spec.rb | 5 | ||||
| -rw-r--r-- | spec/models/protected_branch/push_access_level_spec.rb | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/spec/models/protected_branch/merge_access_level_spec.rb b/spec/models/protected_branch/merge_access_level_spec.rb new file mode 100644 index 00000000000..1e7242e9fa8 --- /dev/null +++ b/spec/models/protected_branch/merge_access_level_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe ProtectedBranch::MergeAccessLevel, :models do + it { is_expected.to validate_inclusion_of(:access_level).in_array([Gitlab::Access::MASTER, Gitlab::Access::DEVELOPER, Gitlab::Access::NO_ACCESS]) } +end diff --git a/spec/models/protected_branch/push_access_level_spec.rb b/spec/models/protected_branch/push_access_level_spec.rb new file mode 100644 index 00000000000..de68351198c --- /dev/null +++ b/spec/models/protected_branch/push_access_level_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe ProtectedBranch::PushAccessLevel, :models do + it { is_expected.to validate_inclusion_of(:access_level).in_array([Gitlab::Access::MASTER, Gitlab::Access::DEVELOPER, Gitlab::Access::NO_ACCESS]) } +end |