Commit 4b0b78a5 authored by King Chung Huang's avatar King Chung Huang Committed by Dylan Griffith

Use deep_merge when combining CI content

When combining GitLab CI YAML content, use deep_merge instead of merge
to combine external files and the inline content. This merges the
external files and inline content recursively, providing more options
for customizing jobs loaded from external files.
parent 090f7857
...@@ -15,7 +15,7 @@ module Gitlab ...@@ -15,7 +15,7 @@ module Gitlab
external_files.each do |external_file| external_files.each do |external_file|
validate_external_file(external_file) validate_external_file(external_file)
@content.merge!(content_of(external_file)) @content.deep_merge!(content_of(external_file))
end end
append_inline_content append_inline_content
...@@ -37,7 +37,7 @@ module Gitlab ...@@ -37,7 +37,7 @@ module Gitlab
end end
def append_inline_content def append_inline_content
@content.merge!(@values) @content.deep_merge!(@values)
end end
def remove_include_keyword def remove_include_keyword
......
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