Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-06-28 15:29:31 +0300
committerShinya Maeda <shinya@gitlab.com>2017-06-29 16:39:01 +0300
commit29a511d21541f9500fc12251587048a529c81e1f (patch)
tree994c919453b7696801d3271eada12dbc4e3469a4
parent78288942cabb1df48ae2d1ce4712d827b2ab30e7 (diff)
revert trigger_request.user_variables
-rw-r--r--app/models/ci/build.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index ac5c2bf00ae..093218a74d6 100644
--- 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