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/app
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-04-29 17:53:03 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-04-29 17:53:03 +0300
commitae079c98fea47e8101415cf7c29679bda33c0d45 (patch)
treeff78059a1b5bbbcf4b2c1e9c4a49e1e9ccb08c26 /app
parentd65459a8217dfbc248b058d7b72dbcdc74305141 (diff)
Add latest changes from gitlab-org/security/gitlab@14-10-stable-ee
Diffstat (limited to 'app')
-rw-r--r--app/models/ci/build.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 16c9aa212d0..a8ad55fd5a4 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -911,7 +911,10 @@ module Ci
end
end
- cache
+ type_suffix = pipeline.protected_ref? ? 'protected' : 'non_protected'
+ cache.map do |entry|
+ entry.merge(key: "#{entry[:key]}-#{type_suffix}")
+ end
end
def credentials