diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-04-04 12:23:39 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-04-04 12:23:39 +0300 |
| commit | c115ac4fa55f709187f6634b07e3d4bd067ec787 (patch) | |
| tree | 46f37e3890eb58d5d33c21382ccad792cf96ec7d /lib | |
| parent | 42f6b0250d9c82546e7d911a058ff3edb3f5068c (diff) | |
| parent | e8da6255d93beed1ffa3f55587c12a85561f40b0 (diff) | |
Merge branch '3314-add-on-runner-minutes-for-gitlab-com-ce' into 'master'
Backport some changes from gitlab-ee!9815
Closes #3314
See merge request gitlab-org/gitlab-ce!25908
Diffstat (limited to 'lib')
| -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 |