Don't make this change for now to reduce conflicts
This commit is contained in:
parent
99b142bcf6
commit
20dcd522f0
1 changed files with 9 additions and 9 deletions
|
@ -193,15 +193,15 @@ module Ci
|
|||
# Variables whose value does not depend on other variables
|
||||
def simple_variables
|
||||
variables = predefined_variables
|
||||
variables.concat(project.predefined_variables)
|
||||
variables.concat(pipeline.predefined_variables)
|
||||
variables.concat(runner.predefined_variables) if runner
|
||||
variables.concat(project.container_registry_variables)
|
||||
variables.concat(project.deployment_variables) if has_environment?
|
||||
variables.concat(yaml_variables)
|
||||
variables.concat(user_variables)
|
||||
variables.concat(project.secret_variables)
|
||||
variables.concat(trigger_request.user_variables) if trigger_request
|
||||
variables += project.predefined_variables
|
||||
variables += pipeline.predefined_variables
|
||||
variables += runner.predefined_variables if runner
|
||||
variables += project.container_registry_variables
|
||||
variables += project.deployment_variables if has_environment?
|
||||
variables += yaml_variables
|
||||
variables += user_variables
|
||||
variables += project.secret_variables
|
||||
variables += trigger_request.user_variables if trigger_request
|
||||
variables
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue