summaryrefslogtreecommitdiff
path: root/doc/api
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 03:07:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 03:07:51 +0000
commit83a3209c3f8e5bc055acf80f3440335d2b97133b (patch)
tree0bb8d48ee018534d319311358f7dab6549b752e1 /doc/api
parentf6e2f302412fcb32b644b379778964791789cb62 (diff)
downloadgitlab-ce-83a3209c3f8e5bc055acf80f3440335d2b97133b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
-rw-r--r--doc/api/jobs.md16
-rw-r--r--doc/api/pipelines.md13
-rw-r--r--doc/api/runners.md4
3 files changed, 12 insertions, 21 deletions
diff --git a/doc/api/jobs.md b/doc/api/jobs.md
index 6cd2d0a04f5..4827eafd790 100644
--- a/doc/api/jobs.md
+++ b/doc/api/jobs.md
@@ -346,8 +346,8 @@ Example of response
> **Notes**:
>
> - [Introduced][ce-2893] in GitLab 8.5.
-> - The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced][ee-2346]
-> in [GitLab Premium][ee] 9.5.
+> - The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/2346)
+> in [GitLab Premium](https://about.gitlab.com/pricing/) 9.5.
Get the job's artifacts zipped archive of a project.
@@ -359,7 +359,7 @@ GET /projects/:id/jobs/:job_id/artifacts
|-------------|----------------|----------|-------------------------------------------------------------------------------------------------------------------------------------------------|
| `id` | integer/string | yes | ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user. |
| `job_id` | integer | yes | ID of a job. |
-| `job_token` **(PREMIUM)** | string | no | To be used with [triggers] for multi-project pipelines. It should be invoked only inside `.gitlab-ci.yml`. Its value is always `$CI_JOB_TOKEN`. |
+| `job_token` **(PREMIUM)** | string | no | To be used with [triggers](../ci/triggers/README.md#when-a-pipeline-depends-on-the-artifacts-of-another-pipeline-premium) for multi-project pipelines. It should be invoked only inside `.gitlab-ci.yml`. Its value is always `$CI_JOB_TOKEN`. |
Example request using the `PRIVATE-TOKEN` header:
@@ -406,8 +406,8 @@ Possible response status codes:
> **Notes**:
>
> - [Introduced][ce-5347] in GitLab 8.10.
-> - The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced][ee-2346]
-> in [GitLab Premium][ee] 9.5.
+> - The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/2346)
+> in [GitLab Premium](https://about.gitlab.com/pricing/) 9.5.
Download the artifacts zipped archive from the latest successful pipeline for
the given reference name and job, provided the job finished successfully. This
@@ -425,7 +425,7 @@ Parameters
| `id` | integer/string | yes | ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user. |
| `ref_name` | string | yes | Branch or tag name in repository. HEAD or SHA references are not supported. |
| `job` | string | yes | The name of the job. |
-| `job_token` **(PREMIUM)** | string | no | To be used with [triggers] for multi-project pipelines. It should be invoked only inside `.gitlab-ci.yml`. Its value is always `$CI_JOB_TOKEN`. |
+| `job_token` **(PREMIUM)** | string | no | To be used with [triggers](../ci/triggers/README.md#when-a-pipeline-depends-on-the-artifacts-of-another-pipeline-premium) for multi-project pipelines. It should be invoked only inside `.gitlab-ci.yml`. Its value is always `$CI_JOB_TOKEN`. |
Example request using the `PRIVATE-TOKEN` header:
@@ -841,7 +841,3 @@ Example of response
"user": null
}
```
-
-[ee]: https://about.gitlab.com/pricing/
-[ee-2346]: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/2346
-[triggers]: ../ci/triggers/README.md#when-a-pipeline-depends-on-the-artifacts-of-another-pipeline-premium
diff --git a/doc/api/pipelines.md b/doc/api/pipelines.md
index 9db7c1528ff..490f1304130 100644
--- a/doc/api/pipelines.md
+++ b/doc/api/pipelines.md
@@ -2,7 +2,7 @@
## List project pipelines
-> [Introduced][ce-5837] in GitLab 8.11
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5837) in GitLab 8.11
```plaintext
GET /projects/:id/pipelines
@@ -54,7 +54,7 @@ Example of response
## Get a single pipeline
-> [Introduced][ce-5837] in GitLab 8.11
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5837) in GitLab 8.11
```plaintext
GET /projects/:id/pipelines/:pipeline_id
@@ -132,7 +132,7 @@ Example of response
## Create a new pipeline
-> [Introduced][ce-7209] in GitLab 8.14
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/7209) in GitLab 8.14
```plaintext
POST /projects/:id/pipeline
@@ -180,7 +180,7 @@ Example of response
## Retry jobs in a pipeline
-> [Introduced][ce-5837] in GitLab 8.11
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5837) in GitLab 8.11
```plaintext
POST /projects/:id/pipelines/:pipeline_id/retry
@@ -227,7 +227,7 @@ Response:
## Cancel a pipelines jobs
-> [Introduced][ce-5837] in GitLab 8.11
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5837) in GitLab 8.11
```plaintext
POST /projects/:id/pipelines/:pipeline_id/cancel
@@ -288,6 +288,3 @@ DELETE /projects/:id/pipelines/:pipeline_id
```shell
curl --header "PRIVATE-TOKEN: <your_access_token>" --request "DELETE" "https://gitlab.example.com/api/v4/projects/1/pipelines/46"
```
-
-[ce-5837]: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5837
-[ce-7209]: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/7209
diff --git a/doc/api/runners.md b/doc/api/runners.md
index fa4631c1bd2..c17069b4474 100644
--- a/doc/api/runners.md
+++ b/doc/api/runners.md
@@ -1,8 +1,6 @@
# Runners API
-> [Introduced][ce-2640] in GitLab 8.5
-
-[ce-2640]: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/2640
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/2640) in GitLab 8.5
## Registration and authentication tokens