diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 15:09:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 15:09:21 +0000 |
| commit | c36152ff8c41fad2f413f253eb7ac5c927e47c56 (patch) | |
| tree | bbf300da207de3e8bbf272d44111ceedb18f5833 /doc/ci/yaml/README.md | |
| parent | 286fe61013674fe2d245ffc8d2233baf09923e70 (diff) | |
| download | gitlab-ce-c36152ff8c41fad2f413f253eb7ac5c927e47c56.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/yaml/README.md')
| -rw-r--r-- | doc/ci/yaml/README.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index e0c41d821a6..9224d73b58b 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -4,7 +4,7 @@ type: reference # GitLab CI/CD Pipeline Configuration Reference -GitLab CI/CD [pipelines](../pipelines.md) are configured using a YAML file called `.gitlab-ci.yml` within each project. +GitLab CI/CD [pipelines](../pipelines/index.md) are configured using a YAML file called `.gitlab-ci.yml` within each project. The `.gitlab-ci.yml` file defines the structure and order of the pipelines and determines: @@ -2735,7 +2735,7 @@ test: ``` The job-level timeout can exceed the -[project-level timeout](../../user/project/pipelines/settings.md#timeout) but can not +[project-level timeout](../pipelines/settings.md#timeout) but can not exceed the Runner-specific timeout. ### `parallel` @@ -2906,7 +2906,7 @@ starting, at the cost of reduced parallelization. > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/23464) in GitLab 12.3. `interruptible` is used to indicate that a job should be canceled if made redundant by a newer pipeline run. Defaults to `false`. -This value will only be used if the [automatic cancellation of redundant pipelines feature](../../user/project/pipelines/settings.md#auto-cancel-pending-pipelines) +This value will only be used if the [automatic cancellation of redundant pipelines feature](../pipelines/settings.md#auto-cancel-pending-pipelines) is enabled. When enabled, a pipeline on the same branch will be canceled when: |