summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-02-19 15:45:37 +0000
committerIan Baum <ibaum@gitlab.com>2018-02-23 12:31:31 -0600
commit0d45aceb0292bb1a2e4f67954ed6843dbcb54dcf (patch)
tree4f439ab307a1c73aef429ed19fd80b48840af718
parentc49d45f1d0f5475dee461b11e0c05fd08cc86e7d (diff)
downloadgitlab-ce-0d45aceb0292bb1a2e4f67954ed6843dbcb54dcf.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.yml5
-rw-r--r--config/initializers/flipper.rb2
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