kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Achilleas Pipinellis 2018-03-29 15:08:50 +00:00
parent ed3f171323 fe604312b8
commit 9b76d8512a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/user/project/pipelines/settings.md
View File

@ -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].