diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-06-28 21:29:31 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-07-05 18:36:19 +0900 |
| commit | 8889bb63f79f020ac9fbe2ba15dc9bc1909a4a69 (patch) | |
| tree | 2a767ca94b7c752febb580f344e2f568807ba06c /app/models/ci/build.rb | |
| parent | a91f581e6d8434f420ac3277be11214a4d087850 (diff) | |
| download | gitlab-ce-8889bb63f79f020ac9fbe2ba15dc9bc1909a4a69.tar.gz | |
revert trigger_request.user_variables
Diffstat (limited to 'app/models/ci/build.rb')
| -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 cc8d940080c..77f56d1b27d 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -195,7 +195,7 @@ module Ci variables += yaml_variables variables += user_variables variables += project.secret_variables_for(ref).map(&:to_runner_variable) - variables += trigger_request&.user_variables || [] + variables += trigger_request.user_variables if trigger_request variables += pipeline.pipeline_schedule&.job_variables variables end |