Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-10-07 06:10:03 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-10-07 06:10:03 +0300
commit196b82695bd6f8ff8725628268afdda48e78a901 (patch)
tree605935623846a966ed45e3e814f54e5f5a7eb2f9
parente2c6af91b8df69518588080386932d77e9367aef (diff)
Add latest changes from gitlab-org/gitlab@master
-rw-r--r--doc/ci/yaml/index.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md
index 110f3c9dfbb..0ed4ff91685 100644
--- a/doc/ci/yaml/index.md
+++ b/doc/ci/yaml/index.md
@@ -4383,7 +4383,7 @@ In this example, only runners with *both* the `ruby` and `postgres` tags can run
Use `timeout` to configure a timeout for a specific job. If the job runs for longer
than the timeout, the job fails.
-The job-level timeout can be longer than the [project-level timeout](../pipelines/settings.md#set-a-limit-for-how-long-jobs-can-run).
+The job-level timeout can be longer than the [project-level timeout](../pipelines/settings.md#set-a-limit-for-how-long-jobs-can-run),
but can't be longer than the [runner's timeout](../runners/configure_runners.md#set-maximum-job-timeout-for-a-runner).
**Keyword type**: Job keyword. You can use it only as part of a job or in the