aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-28 13:20:52 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-28 13:20:52 -0800
commit764397f17d4140232c1aa62bc593b3e5f25485e7 (patch)
tree95255bee92b4a5a8129bfd8380c88a984bcc38dc /actionpack/lib/action_controller/caching.rb
parent8fff05ad3212e4302f186ca154a120f00d1b6abd (diff)
parent489138802c3d5f2cdafc8cea22eac0da446099cc (diff)
downloadrails-764397f17d4140232c1aa62bc593b3e5f25485e7.tar.gz
rails-764397f17d4140232c1aa62bc593b3e5f25485e7.tar.bz2
rails-764397f17d4140232c1aa62bc593b3e5f25485e7.zip
Merge pull request #9098 from firmhouse/add-head-requests
Make current_url? work with HEAD requests and remove caching_allowed? since it doesn't do anything
Diffstat (limited to 'actionpack/lib/action_controller/caching.rb')
-rw-r--r--actionpack/lib/action_controller/caching.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index cf2cda039d..ea33d975ef 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -82,10 +82,6 @@ module ActionController
end
end
- def caching_allowed?
- request.get? && response.status == 200
- end
-
def view_cache_dependencies
self.class._view_cache_dependencies.map { |dep| instance_exec(&dep) }.compact
end