Commit 9b76d851 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'docs-fix-per-runner-timeout-section' into 'master'

Fix documentation introduced in gitlab-org/gitlab-ce!17221

See merge request gitlab-org/gitlab-ce!18087
parents ed3f1713 fe604312
...@@ -29,7 +29,7 @@ if the job surpasses the threshold, it is marked as failed. ...@@ -29,7 +29,7 @@ if the job surpasses the threshold, it is marked as failed.
### Timeout overriding on Runner level ### Timeout overriding on Runner level
> - [Introduced][ce-17221] in GitLab 10.6. > - [Introduced][ce-17221] in GitLab 10.7.
Project defined timeout (either specific timeout set by user or the default Project defined timeout (either specific timeout set by user or the default
60 minutes timeout) may be [overridden on Runner level][timeout overriding]. 60 minutes timeout) may be [overridden on Runner level][timeout overriding].
......
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