summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-11-26 08:30:09 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-11-26 08:30:09 +0000
commit10e4c873172d395368e2b1c93cab014b41d2c4e4 (patch)
tree8fab41d217095b8765583b24e539c9d48e922ffd
parent359a03c2bf4c836e8b87a9a219965dfb863115c4 (diff)
parentc4cdf528a5c0fed19365bb2e05ea9ebc0fb5ef37 (diff)
downloadgitlab-ce-10e4c873172d395368e2b1c93cab014b41d2c4e4.tar.gz
Merge branch 'patch-32' into 'master'
Update to properly reference users instead of projects See merge request gitlab-org/gitlab-ce!23325
-rw-r--r--doc/api/users.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/api/users.md b/doc/api/users.md
index e3633c46041..1cf4444319c 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -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