Eliminate condition cases in ci/build.rb

c1388df0 · Shinya Maeda · 6e8ea52b · c1388df0
Commit c1388df0 authored Jun 27, 2017 by Shinya Maeda
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

app/models/ci/build.rb app/models/ci/build.rb +2 -5

No files found.
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -192,11 +192,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 || []
-        variables += trigger_request.user_variables
+      variables += pipeline.pipeline_schedule&.variables&.map(&:to_runner_variable) || []
-      elsif pipeline.pipeline_schedule
-        variables += pipeline.pipeline_schedule.variables.map(&:to_runner_variable)
-      end
      variables
    end