diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-09-04 17:17:36 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-09-04 21:55:26 +0900 |
| commit | fa6b9acaf9759c58353f8407ff20a7d02b8edf92 (patch) | |
| tree | 501f164216de208239c73889a39ef94e82019099 /app/presenters | |
| parent | 3ae2038176b27673b06a040873fdbe19c94d67d3 (diff) | |
| download | gitlab-ce-fa6b9acaf9759c58353f8407ff20a7d02b8edf92.tar.gz | |
trigger_variables should consider trigger_request existstance always
Diffstat (limited to 'app/presenters')
| -rw-r--r-- | app/presenters/ci/build_presenter.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/app/presenters/ci/build_presenter.rb b/app/presenters/ci/build_presenter.rb index 531ccd39cf2..c495c3f39bb 100644 --- a/app/presenters/ci/build_presenter.rb +++ b/app/presenters/ci/build_presenter.rb @@ -17,16 +17,5 @@ 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 |