From 3ae2038176b27673b06a040873fdbe19c94d67d3 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Sat, 2 Sep 2017 02:37:11 +0900 Subject: Remove ci_trigger_request_with_variables --- app/presenters/ci/build_presenter.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'app/presenters') diff --git a/app/presenters/ci/build_presenter.rb b/app/presenters/ci/build_presenter.rb index c495c3f39bb..531ccd39cf2 100644 --- a/app/presenters/ci/build_presenter.rb +++ b/app/presenters/ci/build_presenter.rb @@ -17,5 +17,16 @@ module Ci "Job is redundant and is auto-canceled by Pipeline ##{auto_canceled_by_id}" end end + + def old_or_new_trigger_variables + return @old_or_new_trigger_variables if defined?(@old_or_new_trigger_variables) + + if build.pipeline.variables.any? + @old_or_new_trigger_variables = + build.pipeline.variables&.map { |v| { v.key => v.value } } &.reduce({}, :merge) + else + @old_or_new_trigger_variables = build.trigger_request.variables + end + end end end -- cgit v1.2.1