diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 12:09:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 12:09:46 +0300 |
| commit | 221b529789f4090341a825695aeb49b8df6dd11d (patch) | |
| tree | c8843e4ca5ef1034752eb68712fcf338b24950db /lib/api | |
| parent | 00a8c64ffd18e74df4b1cdeda7776b5221fddafe (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/users.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index 1694f3fe3fb..c986414c223 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -82,6 +82,7 @@ module API optional :blocked, type: Boolean, default: false, desc: 'Filters only blocked users' optional :created_after, type: DateTime, desc: 'Return users created after the specified time' optional :created_before, type: DateTime, desc: 'Return users created before the specified time' + optional :without_projects, type: Boolean, default: false, desc: 'Filters only users without projects' all_or_none_of :extern_uid, :provider use :sort_params @@ -94,7 +95,7 @@ module API authenticated_as_admin! if params[:external].present? || (params[:extern_uid].present? && params[:provider].present?) unless current_user&.admin? - params.except!(:created_after, :created_before, :order_by, :sort, :two_factor) + params.except!(:created_after, :created_before, :order_by, :sort, :two_factor, :without_projects) end users = UsersFinder.new(current_user, params).execute |