Merge branch 'patch-32' into 'master'

Update to properly reference users instead of projects

See merge request gitlab-org/gitlab-ce!23325
This commit is contained in:
Achilleas Pipinellis 2018-11-26 08:30:09 +00:00
commit 10e4c87317
1 changed files with 2 additions and 2 deletions

View File

@ -70,8 +70,8 @@ GET /users
| Attribute | Type | Required | Description |
| --------- | ---- | -------- | ----------- |
| `order_by` | string | no | Return projects ordered by `id`, `name`, `username`, `created_at`, or `updated_at` fields. Default is `id` |
| `sort` | string | no | Return projects sorted in `asc` or `desc` order. Default is `desc` |
| `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` |
| `two_factor` | string | no | Filter users by Two-factor authentication. Filter values are `enabled` or `disabled`. By default it returns all users |
```json