diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-06-27 15:50:24 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-07-05 18:36:18 +0900 |
| commit | 8e2aafcd1c2da329f7fab3f76e625ba86e14fec3 (patch) | |
| tree | 6137601f89b57397ec0a4dc14b8e94f4d78ac490 /app/models | |
| parent | 1247ae0de9a365859db14812db7b1ddeacbd87f4 (diff) | |
| download | gitlab-ce-8e2aafcd1c2da329f7fab3f76e625ba86e14fec3.tar.gz | |
Eliminate condition cases in ci/build.rb
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ci/build.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 06570ccb69b..e23f7279d5a 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -195,11 +195,8 @@ module Ci variables += yaml_variables variables += user_variables variables += project.secret_variables_for(ref).map(&:to_runner_variable) - if trigger_request - variables += trigger_request.user_variables - elsif pipeline.pipeline_schedule - variables += pipeline.pipeline_schedule.variables.map(&:to_runner_variable) - end + variables += trigger_request&.user_variables || [] + variables += pipeline.pipeline_schedule&.variables&.map(&:to_runner_variable) || [] variables end |