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
path: root/doc/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-25 18:09:02 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-25 18:09:02 +0300
commitd1c0c1c4c3241eae6795562d8a0c22def6771238 (patch)
tree676e20b1bbee71a6a78b95dd517f0ffa7e684f96 /doc/ci
parentfc4faf47ac4e5f1ddc40640c42c32405c38c9455 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/runners/runners_scope.md2
-rw-r--r--doc/ci/runners/saas/linux_saas_runner.md3
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/ci/runners/runners_scope.md b/doc/ci/runners/runners_scope.md
index 43204b463b3..e36d57108ab 100644
--- a/doc/ci/runners/runners_scope.md
+++ b/doc/ci/runners/runners_scope.md
@@ -95,7 +95,7 @@ To disable shared runners for a group:
select **Allow projects and subgroups to override the group setting**.
NOTE:
-If you re-enable the shared runners for a group after you disable them, a user with the
+If you re-enable the shared runners for a group after you disable them, a user with the
Owner or Maintainer role must manually change this setting for each project subgroup or project.
### How shared runners pick jobs
diff --git a/doc/ci/runners/saas/linux_saas_runner.md b/doc/ci/runners/saas/linux_saas_runner.md
index f1ae1a368bc..055cf651067 100644
--- a/doc/ci/runners/saas/linux_saas_runner.md
+++ b/doc/ci/runners/saas/linux_saas_runner.md
@@ -89,7 +89,8 @@ Below are the settings for SaaS runners on Linux.
[distributed cache](https://docs.gitlab.com/runner/configuration/autoscale.html#distributed-runners-caching)
that's stored in a Google Cloud Storage (GCS) bucket. Cache contents not updated in
the last 14 days are automatically removed, based on the
- [object lifecycle management policy](https://cloud.google.com/storage/docs/lifecycle).
+ [object lifecycle management policy](https://cloud.google.com/storage/docs/lifecycle). The maximum size of an
+ uploaded cache artifact can be 5GB after the cache becomes a compressed archive.
- **Timeout settings**: Jobs handled by the SaaS Runners on Linux
**time out after 3 hours**, regardless of the timeout configured in a