kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Don't make this change for now to reduce conflicts

Browse source
This commit is contained in:
Lin Jen-Shin 2017-06-01 17:50:10 +08:00
parent 99b142bcf6
commit 20dcd522f0
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/models/ci/build.rb
View file

@ -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