Skip to content

G
gitlab-ce
Commit ad30a5a9 authored by Shinya Maeda's avatar Shinya Maeda
Browse files
Options

revert trigger_request.user_variables

parent f433fee0
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
app/models/ci/build.rb
View file @ ad30a5a9
...@@ -192,7 +192,7 @@ module Ci ...@@ -192,7 +192,7 @@ module Ci
variables += yaml_variables variables += yaml_variables
variables += user_variables variables += user_variables
variables += project.secret_variables_for(ref).map(&:to_runner_variable) 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 += pipeline.pipeline_schedule&.job_variables
variables variables
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7