diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/presenters/ci/build_runner_presenter.rb | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/presenters/ci/build_runner_presenter.rb')
-rw-r--r-- | app/presenters/ci/build_runner_presenter.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/presenters/ci/build_runner_presenter.rb b/app/presenters/ci/build_runner_presenter.rb index b0066e2d7f0..8e1b675d051 100644 --- a/app/presenters/ci/build_runner_presenter.rb +++ b/app/presenters/ci/build_runner_presenter.rb @@ -33,11 +33,7 @@ module Ci end def runner_variables - if Feature.enabled?(:variable_inside_variable, project, default_enabled: :yaml) - variables.sort_and_expand_all(project, keep_undefined: true).to_runner_variables - else - variables.to_runner_variables - end + variables.sort_and_expand_all(keep_undefined: true).to_runner_variables end def refspecs |