diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2018-08-23 20:46:02 +1200 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2018-08-23 20:46:02 +1200 |
| commit | d203703021a4c1004bea08de469af546a3fcac2e (patch) | |
| tree | 74d29f2ef0fd1d481f1c4f4b1abdb2fb23e22686 | |
| parent | c0dcf8ce3c1e3d3ee2cb0e73eee615060a864714 (diff) | |
| download | gitlab-ce-scoped_variables_hash_deployment_variables.tar.gz | |
Remove guard against calling project.deployment_variables as that method actually can handle a nil environmentscoped_variables_hash_deployment_variables
| -rw-r--r-- | app/models/ci/build.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index faa160ad6ba..378e65721a5 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -310,7 +310,7 @@ module Ci variables.concat(project.predefined_variables) variables.concat(pipeline.predefined_variables) variables.concat(runner.predefined_variables) if runner - variables.concat(project.deployment_variables(environment: environment)) if environment + variables.concat(project.deployment_variables(environment: environment)) variables.concat(yaml_variables) variables.concat(user_variables) variables.concat(secret_group_variables) |