diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-07-27 16:41:21 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-07-28 12:13:29 +0300 |
| commit | b3b8b595a1a7762c5090c92b3247d82d686bbeff (patch) | |
| tree | 08e9e9a5f2224437400de59bf57478feb43ae604 | |
| parent | 48389e9944d7914ca2027df379a523b493ca4245 (diff) | |
Remove if pipeline.variables in Ci::Build#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 d9029e5fbca..8be2dee6479 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -219,7 +219,7 @@ module Ci variables += project.group.secret_variables_for(ref, project).map(&:to_runner_variable) if project.group variables += secret_variables(environment: environment) variables += trigger_request.user_variables if trigger_request - variables += pipeline.variables.map(&:to_runner_variable) if pipeline.variables + variables += pipeline.variables.map(&:to_runner_variable) variables += pipeline.pipeline_schedule.job_variables if pipeline.pipeline_schedule variables += persisted_environment_variables if environment |