diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 12:09:17 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 12:09:17 +0000 |
| commit | cd52759ee33051b8ad7b88b02ba7954e4fad7018 (patch) | |
| tree | f1096c68e457aef7f5201acd16e4a751ff538026 /doc | |
| parent | 18f7828977b74bf6e5153594a098ef90e773b3b7 (diff) | |
| download | gitlab-ce-cd52759ee33051b8ad7b88b02ba7954e4fad7018.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/deploy_tokens.md | 23 | ||||
| -rw-r--r-- | doc/api/users.md | 6 |
2 files changed, 27 insertions, 2 deletions
diff --git a/doc/api/deploy_tokens.md b/doc/api/deploy_tokens.md index 49bfed3e431..8000629ba78 100644 --- a/doc/api/deploy_tokens.md +++ b/doc/api/deploy_tokens.md @@ -78,7 +78,7 @@ Example response: ### Create a project deploy token -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/21811) in GitLab 12.9. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/21811) in GitLab 12.9. Creates a new deploy token for a project. @@ -113,6 +113,27 @@ Example response: } ``` +### Delete a project deploy token + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/21811) in GitLab 12.9. + +Removes a deploy token from the project. + +``` +DELETE /projects/:id/deploy_tokens/:token_id +``` + +| Attribute | Type | Required | Description | +| --------- | ---- | -------- | ----------- | +| `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | +| `token_id` | integer | yes | The ID of the deploy token | + +Example request: + +```shell +curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/5/deploy_tokens/13" +``` + ## Group deploy tokens These endpoints require group maintainer access or higher. diff --git a/doc/api/users.md b/doc/api/users.md index 1eed5d08d38..c80a65aae45 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -304,10 +304,14 @@ Example Responses: "external": false, "private_profile": false, "current_sign_in_ip": "196.165.1.102", - "last_sign_in_ip": "172.127.2.22" + "last_sign_in_ip": "172.127.2.22", + "plan": "gold", + "trial": true } ``` +NOTE: **Note:** The `plan` and `trial` parameters are only available on GitLab Enterprise Edition. + Users on GitLab [Starter, Bronze, or higher](https://about.gitlab.com/pricing/) will also see the `shared_runners_minutes_limit`, `extra_shared_runners_minutes_limit`, and `note` parameters. |