Commit 449d2bb0 authored by Yorick Peterse's avatar Yorick Peterse

Backport parameters for API::Users

This backports the EE specific parameters for API::Users, and wraps them
in a conditional.
parent 30fb9fff
...@@ -51,6 +51,10 @@ module API ...@@ -51,6 +51,10 @@ module API
optional :avatar, type: File, desc: 'Avatar image for user' optional :avatar, type: File, desc: 'Avatar image for user'
optional :private_profile, type: Boolean, desc: 'Flag indicating the user has a private profile' optional :private_profile, type: Boolean, desc: 'Flag indicating the user has a private profile'
all_or_none_of :extern_uid, :provider 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 end
params :sort_params do params :sort_params do
...@@ -80,6 +84,10 @@ module API ...@@ -80,6 +84,10 @@ module API
use :sort_params use :sort_params
use :pagination use :pagination
use :with_custom_attributes use :with_custom_attributes
if Gitlab.ee?
optional :skip_ldap, type: Boolean, default: false, desc: 'Skip LDAP users'
end
end end
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
get do get do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment