Commit 7cda45da authored by Evan Read's avatar Evan Read

Merge branch 'docs-specify-job-timeout-override-rules' into 'master'

Docs: Specify job timeout override rules

See merge request gitlab-org/gitlab!17761
parents 1bad6b07 391b119a
......@@ -2017,6 +2017,10 @@ test:
timeout: 3h 30m
```
The job-level timeout can exceed the
[project-level timeout](../../user/project/pipelines/settings.md#timeout) but can not
exceed the Runner-specific timeout.
### `parallel`
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/22631) in GitLab 11.5.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment