diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2019-09-11 11:13:26 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-09-11 11:13:26 +0000 |
| commit | 71cc59e5bcedaa6ffff17c1f335ecb5ec57956eb (patch) | |
| tree | 689287d36de2e6cf4a6e42c2b875c2e5122e45fb /doc/ci | |
| parent | 2cb7463a3f4d60bd95c0ee9a362fb184e377c03d (diff) | |
| download | gitlab-ce-71cc59e5bcedaa6ffff17c1f335ecb5ec57956eb.tar.gz | |
Change links to relative
Make several links, mostly in admin troubleshooting,
relative, as is the standard
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/docker/using_docker_build.md | 2 | ||||
| -rw-r--r-- | doc/ci/yaml/README.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md index fc0125fcc18..4da527154ad 100644 --- a/doc/ci/docker/using_docker_build.md +++ b/doc/ci/docker/using_docker_build.md @@ -580,7 +580,7 @@ For private and internal projects: If you want to use your own Docker images for docker-in-docker there are a few things you need to do in addition to the steps in the [docker-in-docker](#use-docker-in-docker-workflow-with-docker-executor) section: 1. Update the `image` and `service` to point to your registry. -1. Add a service [alias](https://docs.gitlab.com/ee/ci/yaml/#servicesalias). +1. Add a service [alias](../yaml/README.md#servicesalias). Below is an example of what your `.gitlab-ci.yml` should look like, assuming you have it configured with [TLS enabled](#tls-enabled): diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 8aae0e85c89..61012d8653a 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -2089,7 +2089,7 @@ staging: > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23464) in GitLab 12.3. `interruptible` is used to indicate that a job should be canceled if made redundant by a newer run of the same job. Defaults to `true`. -This value will only be used if the [automatic cancellation of redundant pipelines feature](https://docs.gitlab.com/ee/user/project/pipelines/settings.html#auto-cancel-pending-pipelines) +This value will only be used if the [automatic cancellation of redundant pipelines feature](../../user/project/pipelines/settings.md#auto-cancel-pending-pipelines) is enabled. When enabled, a pipeline on the same branch will be canceled when: |