diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-03-29 15:08:50 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-03-29 15:08:50 +0000 |
| commit | 9b76d8512a5491202e5a953950cc815be9536648 (patch) | |
| tree | 904db74feee200d31779c5b9ccd8a7e4170862aa | |
| parent | ed3f1713234e41b852fbbb1e3a6c5bad19990010 (diff) | |
| parent | fe604312b80a05bc891df6156343ef5acae45b68 (diff) | |
| download | gitlab-ce-9b76d8512a5491202e5a953950cc815be9536648.tar.gz | |
Merge branch 'docs-fix-per-runner-timeout-section' into 'master'44805-rename-custom-metric-section-headers
Fix documentation introduced in gitlab-org/gitlab-ce!17221
See merge request gitlab-org/gitlab-ce!18087
| -rw-r--r-- | doc/user/project/pipelines/settings.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/pipelines/settings.md b/doc/user/project/pipelines/settings.md index 1052c9efa25..6cead7b9961 100644 --- a/doc/user/project/pipelines/settings.md +++ b/doc/user/project/pipelines/settings.md @@ -29,7 +29,7 @@ if the job surpasses the threshold, it is marked as failed. ### 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 60 minutes timeout) may be [overridden on Runner level][timeout overriding]. |