diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-03-14 10:05:06 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-03-14 10:05:06 +0100 |
| commit | e7e06566e150af8ecc54c67bd6f5cd5b86c99628 (patch) | |
| tree | 11ab4aa1d7aafa4c1023fdbb0e13e89fd1125fb9 /app/models/ci | |
| parent | d5789d4e2396716783520a695f756a58c3788175 (diff) | |
| download | gitlab-ce-e7e06566e150af8ecc54c67bd6f5cd5b86c99628.tar.gz | |
Port deployment variables skeleton code from EE
This commit backports method signatures and related implementation to
the CE, to make CE and EE identical. This does not add any features from
EE, it is only aimed to reduce conflicts between CE and EE in the
future.
Diffstat (limited to 'app/models/ci')
| -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 ef1e1e08fba..f8a3600e863 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -257,7 +257,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) if has_environment? + variables.concat(project.deployment_variables(environment: environment)) if has_environment? variables.concat(yaml_variables) variables.concat(user_variables) variables.concat(project.group.secret_variables_for(ref, project)) if project.group |