diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-28 06:09:56 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-28 06:09:56 +0000 |
| commit | 1d42c38d9b4d4ca651db435c8eb0c47bd24a25e2 (patch) | |
| tree | add5ce3542470c7d3626c5669898ca3546f29285 /doc/api | |
| parent | 3f5f07675c4205c28791486d66bcbe80b7e0eca4 (diff) | |
| download | gitlab-ce-1d42c38d9b4d4ca651db435c8eb0c47bd24a25e2.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/api_resources.md | 2 | ||||
| -rw-r--r-- | doc/api/releases/index.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/api/api_resources.md b/doc/api/api_resources.md index 898aa713331..3d448b2a65f 100644 --- a/doc/api/api_resources.md +++ b/doc/api/api_resources.md @@ -9,7 +9,7 @@ Available resources for the [GitLab API](README.md) can be grouped in the follow See also: - [V3 to V4](v3_to_v4.md). -- Adding [deploy keys for multiple projects](deploy_key_multiple_projects.md). +- Adding [deploy keys for multiple projects](deploy_keys.md#adding-deploy-keys-to-multiple-projects). - [API Resources for various templates](#templates-api-resources). ## Project resources diff --git a/doc/api/releases/index.md b/doc/api/releases/index.md index 357f7e7a125..54dc2ecaa33 100644 --- a/doc/api/releases/index.md +++ b/doc/api/releases/index.md @@ -365,7 +365,7 @@ POST /projects/:id/releases | `assets:links` | array of hash | no | An array of assets links. | | `assets:links:name`| string | required by: `assets:links` | The name of the link. | | `assets:links:url` | string | required by: `assets:links` | The URL of the link. | -| `assets:links:filepath` | string | no | Optional path for a [Direct Asset link](../../user/project/releases.md). +| `assets:links:filepath` | string | no | Optional path for a [Direct Asset link](../../user/project/releases/index.md). | `assets:links:link_type` | string | no | The type of the link: `other`, `runbook`, `image`, `package`. Defaults to `other`. | `released_at` | datetime | no | The date when the release will be/was ready. Defaults to the current time. Expected in ISO 8601 format (`2019-03-15T08:00:00Z`). | |