revert trigger_request.user_variables

8889bb63 · Shinya Maeda · a91f581e · 8889bb63
Commit 8889bb63 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
@@ -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