Commit d64ec096 authored by Blair Lunceford's avatar Blair Lunceford

added the edits

parent 31ebf14e
...@@ -75,7 +75,7 @@ GET /users ...@@ -75,7 +75,7 @@ GET /users
| `order_by` | string | no | Return users ordered by `id`, `name`, `username`, `created_at`, or `updated_at` fields. Default is `id` | | `order_by` | string | no | Return users ordered by `id`, `name`, `username`, `created_at`, or `updated_at` fields. Default is `id` |
| `sort` | string | no | Return users sorted in `asc` or `desc` order. Default is `desc` | | `sort` | string | no | Return users sorted in `asc` or `desc` order. Default is `desc` |
| `two_factor` | string | no | Filter users by Two-factor authentication. Filter values are `enabled` or `disabled`. By default it returns all users | | `two_factor` | string | no | Filter users by Two-factor authentication. Filter values are `enabled` or `disabled`. By default it returns all users |
| `without_projects` | boolean | no | Filter users without projects | | `without_projects` | boolean | no | Filter users without projects. Default is `false` |
```json ```json
[ [
......
...@@ -82,7 +82,7 @@ module API ...@@ -82,7 +82,7 @@ module API
optional :blocked, type: Boolean, default: false, desc: 'Filters only blocked users' 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_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 :created_before, type: DateTime, desc: 'Return users created before the specified time'
optional :without_projects, type: Boolean, desc: 'Filters only users without projects' optional :without_projects, type: Boolean, default: false, desc: 'Filters only users without projects'
all_or_none_of :extern_uid, :provider all_or_none_of :extern_uid, :provider
use :sort_params use :sort_params
......
...@@ -281,8 +281,6 @@ describe API::Users, :do_not_mock_admin_mode do ...@@ -281,8 +281,6 @@ describe API::Users, :do_not_mock_admin_mode do
end end
it "returns users without projects" do it "returns users without projects" do
admin
user
user_without_projects = create(:user) user_without_projects = create(:user)
create(:project, namespace: user.namespace) create(:project, namespace: user.namespace)
create(:project, namespace: admin.namespace) create(:project, namespace: admin.namespace)
......
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