aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/cache/mem_cache_store.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-06-23 16:52:39 +0200
committerJosé Valim <jose.valim@gmail.com>2009-06-23 16:52:39 +0200
commit0744900861892be85b4a110612a8e92aed94d858 (patch)
treee879b3cd4d0839baaa0fb50f0927c6671b75ca11 /activesupport/lib/active_support/cache/mem_cache_store.rb
parent6dd196914c293fbc1a331e4a0bc1c06a26dded43 (diff)
parent80f1f863cd0f9cba89079511282de5710a2e1832 (diff)
downloadrails-0744900861892be85b4a110612a8e92aed94d858.tar.gz
rails-0744900861892be85b4a110612a8e92aed94d858.tar.bz2
rails-0744900861892be85b4a110612a8e92aed94d858.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activesupport/lib/active_support/cache/mem_cache_store.rb')
-rw-r--r--activesupport/lib/active_support/cache/mem_cache_store.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index 38b3409ca6..954d0f5423 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -130,10 +130,6 @@ module ActiveSupport
end
private
- def expires_in(options)
- (options && options[:expires_in]) || 0
- end
-
def raw?(options)
options && options[:raw]
end