diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-12 00:06:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-12 00:06:21 +0000 |
| commit | 75687c79df805b57914d79cf217e3f08dbc77cc2 (patch) | |
| tree | bff07aefc6467b8a7e00cd7649109fc6e8b7768f /doc/api | |
| parent | 0c3f12149372a79b825d265a6c28dc547e4a1afc (diff) | |
| download | gitlab-ce-75687c79df805b57914d79cf217e3f08dbc77cc2.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/scim.md | 2 | ||||
| -rw-r--r-- | doc/api/users.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/api/scim.md b/doc/api/scim.md index 134761334b6..cf9d8ebbec2 100644 --- a/doc/api/scim.md +++ b/doc/api/scim.md @@ -21,7 +21,7 @@ Parameters: | Attribute | Type | Required | Description | |:----------|:--------|:---------|:----------------------------------------------------------------------------------------------------------------------------------------| -| `filter` | string | yes | A [filter](#available-filters) expression. | +| `filter` | string | no | A [filter](#available-filters) expression. | | `group_path` | string | yes | Full path to the group. | | `startIndex` | integer | no | The 1-based index indicating where to start returning results from. A value of less than one will be interpreted as 1. | | `count` | integer | no | Desired maximum number of query results. | diff --git a/doc/api/users.md b/doc/api/users.md index f95ad7b62ba..c82a5e23c8e 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -1124,7 +1124,7 @@ Parameters: ## Block user -Blocks the specified user. Available only for admin. +Blocks the specified user. Available only for admin. ``` POST /users/:id/block @@ -1139,7 +1139,7 @@ Will return `201 OK` on success, `404 User Not Found` is user cannot be found or ## Unblock user -Unblocks the specified user. Available only for admin. +Unblocks the specified user. Available only for admin. ``` POST /users/:id/unblock |