From de5eb9ed9869fad99af0296267594e5ae6dff74b Mon Sep 17 00:00:00 2001
From: Andrew White <andrew.white@unboxed.co>
Date: Wed, 15 Mar 2017 14:53:25 +0000
Subject: Restore 5.minutes changed in #28204
---
activesupport/lib/active_support/cache/mem_cache_store.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index 5eee04a34e..e09cee3335 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -156,7 +156,7 @@ module ActiveSupport
expires_in = options[:expires_in].to_i
if expires_in > 0 && !options[:raw]
# Set the memcache expire a few minutes in the future to support race condition ttls on read
- expires_in += 300
+ expires_in += 5.minutes
end
rescue_error_with false do
@data.send(method, key, value, expires_in, options)
--
cgit v1.2.3