diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-11-24 12:41:36 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-11-24 13:20:56 +0000 |
| commit | d6dd9d712ac24a095d0b0506731f9415b7c3b5f5 (patch) | |
| tree | dd8cb75a449d3632902d94933ab36210f5d6abf8 /lib/api | |
| parent | e548c613346a09ba2fc8dfd6ed64da6628ec6a45 (diff) | |
| download | gitlab-ce-d6dd9d712ac24a095d0b0506731f9415b7c3b5f5.tar.gz | |
Fix ProtectedBranch access level validations
Before an access_level was required in EE even when an
it had been set for a user/group.
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 |