diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-20 12:06:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-20 12:06:17 +0300 |
| commit | 8ac91ecfd1bb445a0a1572b3c0885c41c9037e8a (patch) | |
| tree | 4b8c9d2a99ad50ef84421b57758869863ea477a2 /doc | |
| parent | 7e20809103e1f9c0c96c3a96705224c81bf448d5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/yaml/README.md | 10 | ||||
| -rw-r--r-- | doc/development/ee_features.md | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 56dcc15527b..4d0bdf40b28 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -110,7 +110,7 @@ The following table lists available parameters for jobs: | [`dependencies`](#dependencies) | Other jobs that a job depends on so that you can pass artifacts between them. | | [`coverage`](#coverage) | Code coverage settings for a given job. | | [`retry`](#retry) | When and how many times a job can be auto-retried in case of a failure. | -| [`timeout`](#timeout) | Define a custom timeout that would take precedence over the project-wide one. | +| [`timeout`](#timeout) | Define a custom job-level timeout that takes precedence over the project-wide setting. | | [`parallel`](#parallel) | How many instances of a job should be run in parallel. | | [`trigger`](#trigger-premium) | Defines a downstream pipeline trigger. | | [`include`](#include) | Allows this job to include external YAML files. Also available: `include:local`, `include:file`, `include:template`, and `include:remote`. | @@ -1996,9 +1996,11 @@ Possible values for `when` are: - `missing_dependency_failure`: Retry if a dependency was missing. - `runner_unsupported`: Retry if the runner was unsupported. -### timeout +### `timeout` -`timeout` allows you to configure a timeout for a specific job: +> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/14887) in GitLab 12.3. + +`timeout` allows you to configure a timeout for a specific job. For example: ```yaml build: @@ -2129,7 +2131,7 @@ step-1: stage: stage1 script: - echo "Can be canceled" - + step-2: stage: stage2 script: diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md index 6de6497c8c4..22dd9be073f 100644 --- a/doc/development/ee_features.md +++ b/doc/development/ee_features.md @@ -19,7 +19,7 @@ CE specs should remain untouched as much as possible and extra specs should be added for EE. Licensed features can be stubbed using the spec helper `stub_licensed_features` in `EE::LicenseHelpers`. -You can force Webpack to act as CE by either deleting the `ee/` directory or by +You can force GitLab to act as CE by either deleting the `ee/` directory or by setting the [`IS_GITLAB_EE` environment variable](https://gitlab.com/gitlab-org/gitlab/blob/master/config/helpers/is_ee_env.js) to something that evaluates as `false`. The same works for running tests (for example `IS_GITLAB_EE=0 yarn jest`). |