diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /lib/expand_variables.rb | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'lib/expand_variables.rb')
-rw-r--r-- | lib/expand_variables.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/expand_variables.rb b/lib/expand_variables.rb index 06cebab8f0a..d172df4920f 100644 --- a/lib/expand_variables.rb +++ b/lib/expand_variables.rb @@ -45,6 +45,9 @@ module ExpandVariables # Lazily initialise variables variables = variables.call if variables.is_a?(Proc) + # Convert Collection to variables + variables = variables.to_hash if variables.is_a?(Gitlab::Ci::Variables::Collection) + # Convert hash array to variables if variables.is_a?(Array) variables = variables.reduce({}) do |hash, variable| |