diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-14 18:09:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-14 18:09:57 +0300 |
| commit | b689f371350fbf1b71f266764ee018befc9b91f7 (patch) | |
| tree | 7de1d3ab26d3cae0ac2a7a8ccd8302fcdaac5534 /doc/ci/yaml | |
| parent | 0b194c4854f312e36616fccf7c610cb2b0ec6957 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/yaml')
| -rw-r--r-- | doc/ci/yaml/index.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md index 8cdcdb2d61d..26974eb4abd 100644 --- a/doc/ci/yaml/index.md +++ b/doc/ci/yaml/index.md @@ -3418,7 +3418,7 @@ test: ``` The job-level timeout can exceed the -[project-level timeout](../pipelines/settings.md#timeout) but can't +[project-level timeout](../pipelines/settings.md#set-a-limit-for-how-long-jobs-can-run) but can't exceed the runner-specific timeout. ### `parallel` |