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

Merge branch 'docs-fix-per-runner-timeout-section' into 'master'
9b76d851 · Achilleas Pipinellis · ed3f1713 · fe604312 · 9b76d851
Commit 9b76d851 authored Mar 29, 2018 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

settings.md doc/user/project/pipelines/settings.md +1 -1

No files found.
--- 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].