aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-12-15 15:22:33 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-12-15 15:22:33 -0200
commitca8e14862a9f6f3ec37fb2842d76ecefd4eb2b4e (patch)
treeda4ac7e4f893b294d02f8564dfd675c0bc0046d6 /actionview/lib
parentff370ee61754b00f864f3ddd0af62be4dfa0de67 (diff)
parente73fe1dd8c2740ae29e7a7f48d71a62b46e6b49d (diff)
downloadrails-ca8e14862a9f6f3ec37fb2842d76ecefd4eb2b4e.tar.gz
rails-ca8e14862a9f6f3ec37fb2842d76ecefd4eb2b4e.tar.bz2
rails-ca8e14862a9f6f3ec37fb2842d76ecefd4eb2b4e.zip
Merge remote-tracking branch 'origin/master' into merge-action-cable
Diffstat (limited to 'actionview/lib')
-rw-r--r--actionview/lib/action_view/helpers/cache_helper.rb8
1 files changed, 0 insertions, 8 deletions
diff --git a/actionview/lib/action_view/helpers/cache_helper.rb b/actionview/lib/action_view/helpers/cache_helper.rb
index e473aeaea9..18b2102d73 100644
--- a/actionview/lib/action_view/helpers/cache_helper.rb
+++ b/actionview/lib/action_view/helpers/cache_helper.rb
@@ -216,14 +216,6 @@ module ActionView
end
end
- # Given a key (as described in ActionController::Caching::Fragments.expire_fragment),
- # returns a key suitable for use in reading, writing, or expiring a
- # cached fragment. All keys are prefixed with <tt>views/</tt> and uses
- # ActiveSupport::Cache.expand_cache_key for the expansion.
- def fragment_cache_key(key)
- ActiveSupport::Cache.expand_cache_key(key.is_a?(Hash) ? url_for(key).split("://").last : key, :views)
- end
-
private
def fragment_name_with_digest(name, virtual_path) #:nodoc: