diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-09 06:42:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-09 06:42:22 +0300 |
| commit | 7dd9256e5eac896fb422566376086a0befc79151 (patch) | |
| tree | be65227875ddb0cff4961ae2d97380bbf64dd851 /lib/gitlab/ci/variables | |
| parent | 2295d352f6073101497f9bf4e4981c7ae72706a3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/variables')
| -rw-r--r-- | lib/gitlab/ci/variables/collection.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/ci/variables/collection.rb b/lib/gitlab/ci/variables/collection.rb index 09c75a2b3f1..544c54d8aa8 100644 --- a/lib/gitlab/ci/variables/collection.rb +++ b/lib/gitlab/ci/variables/collection.rb @@ -90,8 +90,6 @@ module Gitlab end def sort_and_expand_all(project, keep_undefined: false) - return self if Feature.disabled?(:variable_inside_variable, project, default_enabled: :yaml) - sorted = Sort.new(self) return self.class.new(self, sorted.errors) unless sorted.valid? |