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>2022-05-03 12:07:47 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-05-03 12:07:47 +0300
commit4df4a22481c3ed10e22cdb795dd6d811c4e89fde (patch)
treed166b61c9e438d82ca500b8a8c75f9c94d8847c2 /doc/ci/caching
parent982c486da485262bf93d2ef9d160711aeb04afc3 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/caching')
-rw-r--r--doc/ci/caching/index.md6
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/ci/caching/index.md b/doc/ci/caching/index.md
index 25271864895..2b41694bebb 100644
--- a/doc/ci/caching/index.md
+++ b/doc/ci/caching/index.md
@@ -447,13 +447,11 @@ is stored on the machine where GitLab Runner is installed. The location also dep
If you use cache and artifacts to store the same path in your jobs, the cache might
be overwritten because caches are restored before artifacts.
-### Segregation of caches between protected and non-protected branches
+#### Cache key names
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/330047) in GitLab 14.10.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/330047) in GitLab 15.0.
A suffix is added to the cache key, with the exception of the [fallback cache key](#use-a-fallback-cache-key).
-This is done in order to prevent cache poisoning that might occur through manipulation of the cache in a non-protected
-branch. Any subsequent protected-branch jobs would then potentially use a poisoned cache from the preceding job.
As an example, assuming that `cache.key` is set to `$CI_COMMIT_REF_SLUG`, and that we have two branches `main`
and `feature`, then the following table represents the resulting cache keys: