diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-22 16:35:54 +0100 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-26 14:18:29 +0100 |
| commit | 05534daa1c547fcab7540338f0f71c2403a40342 (patch) | |
| tree | d71c166ae237b59a5971d4d04ffc03e34a4587b5 /lib/api/protected_branches.rb | |
| parent | be49d9c1babad3e169f15eaf6b07565af2d0298a (diff) | |
| download | gitlab-ce-05534daa1c547fcab7540338f0f71c2403a40342.tar.gz | |
Backport changes to API::ProtectedBranches
This backports EE specific parameters EE adds to API::ProtectedBranches,
and wraps them in a conditional.
Diffstat (limited to 'lib/api/protected_branches.rb')
| -rw-r--r-- | lib/api/protected_branches.rb | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/lib/api/protected_branches.rb b/lib/api/protected_branches.rb index 5af43448727..f8cce1ed784 100644 --- a/lib/api/protected_branches.rb +++ b/lib/api/protected_branches.rb @@ -51,6 +51,30 @@ module API optional :merge_access_level, type: Integer, values: ProtectedBranch::MergeAccessLevel.allowed_access_levels, desc: 'Access levels allowed to merge (defaults: `40`, maintainer access level)' + + if Gitlab.ee? + optional :unprotect_access_level, type: Integer, + values: ProtectedBranch::UnprotectAccessLevel.allowed_access_levels, + desc: 'Access levels allowed to unprotect (defaults: `40`, maintainer access level)' + + optional :allowed_to_push, type: Array, desc: 'An array of users/groups allowed to push' do + optional :access_level, type: Integer, values: ProtectedBranch::PushAccessLevel.allowed_access_levels + optional :user_id, type: Integer + optional :group_id, type: Integer + end + + optional :allowed_to_merge, type: Array, desc: 'An array of users/groups allowed to merge' do + optional :access_level, type: Integer, values: ProtectedBranch::MergeAccessLevel.allowed_access_levels + optional :user_id, type: Integer + optional :group_id, type: Integer + end + + optional :allowed_to_unprotect, type: Array, desc: 'An array of users/groups allowed to unprotect' do + optional :access_level, type: Integer, values: ProtectedBranch::UnprotectAccessLevel.allowed_access_levels + optional :user_id, type: Integer + optional :group_id, type: Integer + end + end end # rubocop: disable CodeReuse/ActiveRecord post ':id/protected_branches' do |