diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
commit | edaa33dee2ff2f7ea3fac488d41558eb5f86d68c (patch) | |
tree | 11f143effbfeba52329fb7afbd05e6e2a3790241 /lib/api/terraform/modules/v1/packages.rb | |
parent | d8a5691316400a0f7ec4f83832698f1988eb27c1 (diff) |
Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42
Diffstat (limited to 'lib/api/terraform/modules/v1/packages.rb')
-rw-r--r-- | lib/api/terraform/modules/v1/packages.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/api/terraform/modules/v1/packages.rb b/lib/api/terraform/modules/v1/packages.rb index ad5a4ae7ea6..970fdeba734 100644 --- a/lib/api/terraform/modules/v1/packages.rb +++ b/lib/api/terraform/modules/v1/packages.rb @@ -71,7 +71,11 @@ module API def package_file strong_memoize(:package_file) do - package.package_files.first + if Feature.enabled?(:packages_installable_package_files, default_enabled: :yaml) + package.installable_package_files.first + else + package.package_files.first + end end end end |