revert trigger_request.user_variables

ad30a5a9 · Shinya Maeda · f433fee0 · ad30a5a9
Commit ad30a5a9 authored Jun 28, 2017 by Shinya Maeda
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/models/ci/build.rb app/models/ci/build.rb +1 -1

No files found.
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -192,7 +192,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