summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2019-03-25 15:33:16 +0100
committerYorick Peterse <yorickpeterse@gmail.com>2019-03-26 14:18:29 +0100
commit449d2bb0d894fa6cd31353b82c3b060821d728de (patch)
treeee98c0fbd4edc18055de3e933f75792031b4cb9e
parent30fb9fffecb254efe8ebbdc0fab6171bda2566cd (diff)
downloadgitlab-ce-449d2bb0d894fa6cd31353b82c3b060821d728de.tar.gz
Backport parameters for API::Users
This backports the EE specific parameters for API::Users, and wraps them in a conditional.
-rw-r--r--lib/api/users.rb8
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