diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-24 16:16:31 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-24 16:16:31 +0000 |
| commit | b355ebc4c9b38320366d7640ecf51da23fbb7ea1 (patch) | |
| tree | 29fce0fc42322d6044286b8866580662c1e20199 /lib/api | |
| parent | 7230a344537f653747b23ce467851e342e8de5e6 (diff) | |
| parent | 96106287db2b6403809b238689afb592da5e2abf (diff) | |
| download | gitlab-ce-b355ebc4c9b38320366d7640ecf51da23fbb7ea1.tar.gz | |
Merge branch 'jej/fix-protected-branch-validations-ce' into 'master'
Fix ProtectedBranch access level validations
See merge request gitlab-org/gitlab-ce!15586
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/protected_branches.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/protected_branches.rb b/lib/api/protected_branches.rb index 15fcb9e8e27..b5021e8a712 100644 --- a/lib/api/protected_branches.rb +++ b/lib/api/protected_branches.rb @@ -40,10 +40,10 @@ module API params do requires :name, type: String, desc: 'The name of the protected branch' optional :push_access_level, type: Integer, default: Gitlab::Access::MASTER, - values: ProtectedBranchAccess::ALLOWED_ACCESS_LEVELS, + values: ProtectedRefAccess::ALLOWED_ACCESS_LEVELS, desc: 'Access levels allowed to push (defaults: `40`, master access level)' optional :merge_access_level, type: Integer, default: Gitlab::Access::MASTER, - values: ProtectedBranchAccess::ALLOWED_ACCESS_LEVELS, + values: ProtectedRefAccess::ALLOWED_ACCESS_LEVELS, desc: 'Access levels allowed to merge (defaults: `40`, master access level)' end post ':id/protected_branches' do |