diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /lib/feature.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'lib/feature.rb')
-rw-r--r-- | lib/feature.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/feature.rb b/lib/feature.rb index 87abd2689d0..453ecc8255a 100644 --- a/lib/feature.rb +++ b/lib/feature.rb @@ -18,6 +18,10 @@ class Feature superclass.table_name = 'feature_gates' end + # To enable EE overrides + class ActiveSupportCacheStoreAdapter < Flipper::Adapters::ActiveSupportCacheStore + end + InvalidFeatureFlagError = Class.new(Exception) # rubocop:disable Lint/InheritException class << self @@ -167,7 +171,8 @@ class Feature ActiveSupportCacheStoreAdapter.new( active_record_adapter, l2_cache_backend, - expires_in: 1.hour) + expires_in: 1.hour, + write_through: true) # Thread-local L1 cache: use a short timeout since we don't have a # way to expire this cache all at once |