diff options
| author | Rubén Dávila <ruben@gitlab.com> | 2019-04-02 10:55:34 -0500 |
|---|---|---|
| committer | Rubén Dávila <ruben@gitlab.com> | 2019-04-02 23:20:43 -0500 |
| commit | e8da6255d93beed1ffa3f55587c12a85561f40b0 (patch) | |
| tree | 35c3358d0ec8297124e7426789b4295e481865ff /lib/api | |
| parent | ccdf7a93905bb7fd5eb4be5772160a9fad8e19a4 (diff) | |
| download | gitlab-ce-e8da6255d93beed1ffa3f55587c12a85561f40b0.tar.gz | |
Backport some changes from EE3314-add-on-runner-minutes-for-gitlab-com-ce
MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9815
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/groups.rb | 1 | ||||
| -rw-r--r-- | lib/api/users.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/groups.rb b/lib/api/groups.rb index 9fcf476f537..ad16f26f5cc 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -26,6 +26,7 @@ module API optional :ldap_cn, type: String, desc: 'LDAP Common Name' optional :ldap_access, type: Integer, desc: 'A valid access level' optional :shared_runners_minutes_limit, type: Integer, desc: '(admin-only) Pipeline minutes quota for this group' + optional :extra_shared_runners_minutes_limit, type: Integer, desc: '(admin-only) Extra pipeline minutes quota for this group' all_or_none_of :ldap_cn, :ldap_access end end diff --git a/lib/api/users.rb b/lib/api/users.rb index 776329622e2..2f23e33bd4a 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -54,6 +54,7 @@ module API if Gitlab.ee? optional :shared_runners_minutes_limit, type: Integer, desc: 'Pipeline minutes quota for this user' + optional :extra_shared_runners_minutes_limit, type: Integer, desc: '(admin-only) Extra pipeline minutes quota for this user' end end |