diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-25 17:33:16 +0300 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-26 16:18:29 +0300 |
commit | 449d2bb0d894fa6cd31353b82c3b060821d728de (patch) | |
tree | ee98c0fbd4edc18055de3e933f75792031b4cb9e /lib/api/users.rb | |
parent | 30fb9fffecb254efe8ebbdc0fab6171bda2566cd (diff) |
Backport parameters for API::Users
This backports the EE specific parameters for API::Users, and wraps them
in a conditional.
Diffstat (limited to 'lib/api/users.rb')
-rw-r--r-- | lib/api/users.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index a3d4acc63d5..776329622e2 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -51,6 +51,10 @@ module API optional :avatar, type: File, desc: 'Avatar image for user' optional :private_profile, type: Boolean, desc: 'Flag indicating the user has a private profile' all_or_none_of :extern_uid, :provider + + if Gitlab.ee? + optional :shared_runners_minutes_limit, type: Integer, desc: 'Pipeline minutes quota for this user' + end end params :sort_params do @@ -80,6 +84,10 @@ module API use :sort_params use :pagination use :with_custom_attributes + + if Gitlab.ee? + optional :skip_ldap, type: Boolean, default: false, desc: 'Skip LDAP users' + end end # rubocop: disable CodeReuse/ActiveRecord get do |