Commit b68ebe5f authored by Mikołaj Wawrzyniak's avatar Mikołaj Wawrzyniak

Merge branch 'mc_rocha-move-yaml-processor-job-secrets-to-ee-333770' into 'master'

Move yaml processor secrets configuration to EE

See merge request gitlab-org/gitlab!73017
parents a3733f1b 80adf2e6
...@@ -12,7 +12,10 @@ module EE ...@@ -12,7 +12,10 @@ module EE
job = jobs.fetch(name.to_sym, {}) job = jobs.fetch(name.to_sym, {})
super.deep_merge( super.deep_merge(
options: { dast_configuration: job[:dast_configuration] }.compact {
options: { dast_configuration: job[:dast_configuration] }.compact,
secrets: job[:secrets]
}.compact
) )
end end
end end
......
...@@ -80,7 +80,6 @@ module Gitlab ...@@ -80,7 +80,6 @@ module Gitlab
cache: job[:cache], cache: job[:cache],
resource_group_key: job[:resource_group], resource_group_key: job[:resource_group],
scheduling_type: job[:scheduling_type], scheduling_type: job[:scheduling_type],
secrets: job[:secrets],
options: { options: {
image: job[:image], image: job[:image],
services: job[:services], services: job[:services],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment