Merge branch 'flipper-caching' into 'master'

Increase feature flag cache TTL to one hour Closes #40854 See merge request gitlab-org/gitlab-ce!17213

Merge branch 'flipper-caching' into 'master'
31b38ac9 · Douwe Maan · 4a128e44 · ef99a3c8 · 31b38ac9 · 31b38ac9
Commit 31b38ac9 authored Feb 19, 2018 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

flipper-caching.yml changelogs/unreleased/flipper-caching.yml +5 -0

flipper.rb config/initializers/flipper.rb +1 -1

No files found.
--- a/changelogs/unreleased/flipper-caching.yml
+++ b/changelogs/unreleased/flipper-caching.yml
+---
+title: Increase feature flag cache TTL to one hour
+merge_request:
+author:
+type: performance
--- 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