diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
commit | 41fe97390ceddf945f3d967b8fdb3de4c66b7dea (patch) | |
tree | 9c8d89a8624828992f06d892cd2f43818ff5dcc8 /app/helpers/container_expiration_policies_helper.rb | |
parent | 0804d2dc31052fb45a1efecedc8e06ce9bc32862 (diff) |
Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42
Diffstat (limited to 'app/helpers/container_expiration_policies_helper.rb')
-rw-r--r-- | app/helpers/container_expiration_policies_helper.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/helpers/container_expiration_policies_helper.rb b/app/helpers/container_expiration_policies_helper.rb index 52f68ac53f0..0005682e979 100644 --- a/app/helpers/container_expiration_policies_helper.rb +++ b/app/helpers/container_expiration_policies_helper.rb @@ -25,8 +25,7 @@ module ContainerExpirationPoliciesHelper end end - def container_expiration_policies_historic_entry_enabled?(project) - Gitlab::CurrentSettings.container_expiration_policies_enable_historic_entries || - Feature.enabled?(:container_expiration_policies_historic_entry, project) + def container_expiration_policies_historic_entry_enabled? + Gitlab::CurrentSettings.container_expiration_policies_enable_historic_entries end end |