diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 18:09:38 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 18:09:38 +0300 |
| commit | 2d8454515e7b631a8f39a6415c86154d6c62841c (patch) | |
| tree | d3d5fac01f23a735226cf20a4073e2cb611664d3 /.gitlab-ci.yml | |
| parent | 9d67bc14cb59a27c9877474e77d155173a1dedff (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 249bb35ec56..a5b80c7ca55 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,8 @@ default: - gitlab-org # All jobs are interruptible by default interruptible: true + # Default job timeout set to 90m https://gitlab.com/gitlab-com/gl-infra/infrastructure/-/issues/10520 + timeout: 90m workflow: rules: |