diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 12:07:52 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 12:07:52 +0000 |
commit | c6c7437861bff9572747674095c4dfbdfbea4988 (patch) | |
tree | 237d1ed922193f19ae326923457344c082003788 /doc | |
parent | d80f3cd75e700b6e62910865bfd36734644ffa89 (diff) | |
download | gitlab-ce-c6c7437861bff9572747674095c4dfbdfbea4988.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/audit_events.md | 1 | ||||
-rw-r--r-- | doc/api/graphql/reference/gitlab_schema.graphql | 4 | ||||
-rw-r--r-- | doc/api/graphql/reference/gitlab_schema.json | 20 | ||||
-rw-r--r-- | doc/api/users.md | 7 |
4 files changed, 14 insertions, 18 deletions
diff --git a/doc/administration/audit_events.md b/doc/administration/audit_events.md index 5b3052789e4..cc8135a86c4 100644 --- a/doc/administration/audit_events.md +++ b/doc/administration/audit_events.md @@ -107,6 +107,7 @@ recorded: - User was deleted ([introduced](https://gitlab.com/gitlab-org/gitlab/issues/251) in GitLab 12.8) - User was added ([introduced](https://gitlab.com/gitlab-org/gitlab/issues/251) in GitLab 12.8) - User was blocked via Admin Area ([introduced](https://gitlab.com/gitlab-org/gitlab/issues/251) in GitLab 12.8) +- User was blocked via API ([introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25872) in GitLab 12.9) It's possible to filter particular actions by choosing an audit data type from the filter dropdown box. You can further filter by specific group, project, or user diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql index eae3626515e..7dda073d8ae 100644 --- a/doc/api/graphql/reference/gitlab_schema.graphql +++ b/doc/api/graphql/reference/gitlab_schema.graphql @@ -8011,7 +8011,7 @@ input UpdateIssueInput { """ Indicates the issue is confidential """ - confidential: Boolean! + confidential: Boolean """ Description of the issue @@ -8021,7 +8021,7 @@ input UpdateIssueInput { """ Due date of the issue """ - dueDate: Time! + dueDate: Time """ The desired health status diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json index bf59c94f6cc..83b098dc73d 100644 --- a/doc/api/graphql/reference/gitlab_schema.json +++ b/doc/api/graphql/reference/gitlab_schema.json @@ -21114,13 +21114,9 @@ "name": "dueDate", "description": "Due date of the issue", "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "Time", - "ofType": null - } + "kind": "SCALAR", + "name": "Time", + "ofType": null }, "defaultValue": null }, @@ -21128,13 +21124,9 @@ "name": "confidential", "description": "Indicates the issue is confidential", "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "Boolean", - "ofType": null - } + "kind": "SCALAR", + "name": "Boolean", + "ofType": null }, "defaultValue": null }, diff --git a/doc/api/users.md b/doc/api/users.md index 49bd090f294..1eed5d08d38 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -1168,8 +1168,11 @@ Parameters: - `id` (required) - id of specified user -Will return `201 OK` on success, `404 User Not Found` is user cannot be found or -`403 Forbidden` when trying to block an already blocked user by LDAP synchronization. +Returns: + +- `201 OK` on success. +- `404 User Not Found` if user cannot be found. +- `403 Forbidden` when trying to block an already blocked user by LDAP synchronization. ## Unblock user |