diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-03-01 12:50:33 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-03-01 12:51:00 +0100 |
| commit | 42b2abbeb1e52d13b21ad8ab2df5737d10475f60 (patch) | |
| tree | a0fd5041c153964c47505c91706c5930f0c0f278 | |
| parent | a648209a07704d08e2a2faa9059d7b6e912bda62 (diff) | |
| download | gitlab-ce-42b2abbeb1e52d13b21ad8ab2df5737d10475f60.tar.gz | |
Revert support for simplified pipeline expressions
| -rw-r--r-- | lib/gitlab/ci/pipeline/expression/statement.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/ci/pipeline/expression/statement.rb b/lib/gitlab/ci/pipeline/expression/statement.rb index 017c7f11657..9c0d87ba4fb 100644 --- a/lib/gitlab/ci/pipeline/expression/statement.rb +++ b/lib/gitlab/ci/pipeline/expression/statement.rb @@ -19,7 +19,11 @@ module Gitlab return if pipeline.nil? - @variables = pipeline.runtime_variables.map do |variable| + @variables = pipeline.variables.map do |variable| + [variable.key, variable.value] + end + + @variables += pipeline.predefined_variables.map do |variable| [variable.fetch(:key), variable.fetch(:value)] end end |