Commit 20dcd522 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Don't make this change for now to reduce conflicts

parent 99b142bc
...@@ -193,15 +193,15 @@ module Ci ...@@ -193,15 +193,15 @@ module Ci
# Variables whose value does not depend on other variables # Variables whose value does not depend on other variables
def simple_variables def simple_variables
variables = predefined_variables variables = predefined_variables
variables.concat(project.predefined_variables) variables += project.predefined_variables
variables.concat(pipeline.predefined_variables) variables += pipeline.predefined_variables
variables.concat(runner.predefined_variables) if runner variables += runner.predefined_variables if runner
variables.concat(project.container_registry_variables) variables += project.container_registry_variables
variables.concat(project.deployment_variables) if has_environment? variables += project.deployment_variables if has_environment?
variables.concat(yaml_variables) variables += yaml_variables
variables.concat(user_variables) variables += user_variables
variables.concat(project.secret_variables) variables += project.secret_variables
variables.concat(trigger_request.user_variables) if trigger_request variables += trigger_request.user_variables if trigger_request
variables variables
end end
......
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