diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-03 12:14:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-03 12:14:03 +0300 |
| commit | ffe7c069a4e16f77b80c7159690a4c8060dd74d9 (patch) | |
| tree | 10288a8a7073dad5d2bbe57b9bace1d03cbe45ed /lib/gitlab/ci/variables/builder.rb | |
| parent | 4d84411275a3e21204078ba6e39ccbf612b528f0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/variables/builder.rb')
| -rw-r--r-- | lib/gitlab/ci/variables/builder.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/gitlab/ci/variables/builder.rb b/lib/gitlab/ci/variables/builder.rb index 4c777527ebc..e5b8058a1f6 100644 --- a/lib/gitlab/ci/variables/builder.rb +++ b/lib/gitlab/ci/variables/builder.rb @@ -13,9 +13,6 @@ module Gitlab def scoped_variables(job, environment:, dependencies:) Gitlab::Ci::Variables::Collection.new.tap do |variables| variables.concat(predefined_variables(job)) - - next variables unless pipeline.use_variables_builder_definitions? - variables.concat(project.predefined_variables) variables.concat(pipeline.predefined_variables) variables.concat(job.runner.predefined_variables) if job.runnable? && job.runner |