summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-02-12 11:21:12 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-02-12 11:21:12 +0000
commit52ad7d253c31dc475b89311eca81e0a609056b59 (patch)
tree047fe0df94eeb8590967c43967609b8438a25918
parent7b0517f72678642b5e9575401e96cb39160cb993 (diff)
parent1e555da2cf2316826b93436459a49a2501078997 (diff)
downloadgitlab-ce-52ad7d253c31dc475b89311eca81e0a609056b59.tar.gz
Merge branch 'Doc-project-cicd-timeout-settings-location' into 'master'
Adding info for the location of cicd timeout setting per project See merge request gitlab-org/gitlab-ce!25136
-rw-r--r--doc/user/project/pipelines/settings.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/user/project/pipelines/settings.md b/doc/user/project/pipelines/settings.md
index bb9b4238ee9..cce330aecc7 100644
--- a/doc/user/project/pipelines/settings.md
+++ b/doc/user/project/pipelines/settings.md
@@ -23,6 +23,7 @@ in `.gitlab-ci.yml`.
## Timeout
Timeout defines the maximum amount of time in minutes that a job is able run.
+This is configureable under your project's **Settings > CI/CD > General pipelines settings**.
The default value is 60 minutes. Decrease the time limit if you want to impose
a hard limit on your jobs' running time or increase it otherwise. In any case,
if the job surpasses the threshold, it is marked as failed.