Revert support for simplified pipeline expressions

42b2abbe · Grzegorz Bizon · a648209a · 42b2abbe
Commit 42b2abbe authored Mar 01, 2018 by Grzegorz Bizon
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

lib/gitlab/ci/pipeline/expression/statement.rb lib/gitlab/ci/pipeline/expression/statement.rb +5 -1

No files found.
--- 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