diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-02-19 15:45:37 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-02-19 15:45:37 +0000 |
commit | 31b38ac904f3c897ac520f9b27567deb4255c45f (patch) | |
tree | b4e5baffbfad5d95bcc2c82761ab181999ea73ee | |
parent | 4a128e44cb559510875c2682c564a8e82cb067d7 (diff) | |
parent | ef99a3c8bc09e9f03ee9aec5c07bfeca6b7d7adf (diff) | |
download | gitlab-ce-31b38ac904f3c897ac520f9b27567deb4255c45f.tar.gz |
Merge branch 'flipper-caching' into 'master'
Increase feature flag cache TTL to one hour
Closes #40854
See merge request gitlab-org/gitlab-ce!17213
-rw-r--r-- | changelogs/unreleased/flipper-caching.yml | 5 | ||||
-rw-r--r-- | config/initializers/flipper.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/flipper-caching.yml b/changelogs/unreleased/flipper-caching.yml new file mode 100644 index 00000000000..6db27fd579e --- /dev/null +++ b/changelogs/unreleased/flipper-caching.yml @@ -0,0 +1,5 @@ +--- +title: Increase feature flag cache TTL to one hour +merge_request: +author: +type: performance diff --git a/config/initializers/flipper.rb b/config/initializers/flipper.rb index cc9167d29b9..c60ad535fd5 100644 --- a/config/initializers/flipper.rb +++ b/config/initializers/flipper.rb @@ -8,7 +8,7 @@ Flipper.configure do |config| cached_adapter = Flipper::Adapters::ActiveSupportCacheStore.new( adapter, Rails.cache, - expires_in: 10.seconds) + expires_in: 1.hour) Flipper.new(cached_adapter) end |