From f249d07c44d2f18e508ac83153c9f9cb8bce340b Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Sun, 19 Dec 2010 13:53:08 -0200 Subject: Add missing require --- actionpack/lib/action_controller/caching/pages.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'actionpack/lib/action_controller/caching/pages.rb') diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb index 3e57d2c236..f305ed30fa 100644 --- a/actionpack/lib/action_controller/caching/pages.rb +++ b/actionpack/lib/action_controller/caching/pages.rb @@ -1,4 +1,5 @@ require 'fileutils' +require 'active_support/concern' require 'active_support/core_ext/class/attribute_accessors' module ActionController #:nodoc: -- cgit v1.2.3 From ab2bde45f8140a3ebf8b478e688ef612fc4181fc Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Sun, 19 Dec 2010 19:15:26 -0200 Subject: Remove require AS::Concern from places where is already in --- actionpack/lib/action_controller/caching/pages.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'actionpack/lib/action_controller/caching/pages.rb') diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb index f305ed30fa..3e57d2c236 100644 --- a/actionpack/lib/action_controller/caching/pages.rb +++ b/actionpack/lib/action_controller/caching/pages.rb @@ -1,5 +1,4 @@ require 'fileutils' -require 'active_support/concern' require 'active_support/core_ext/class/attribute_accessors' module ActionController #:nodoc: -- cgit v1.2.3 From 10cab35d3b9e87e4b182162f7783c220cf2a937f Mon Sep 17 00:00:00 2001 From: Andre Arko Date: Sat, 5 Feb 2011 15:52:16 -0800 Subject: Allow page_cache_directory to be set as a Pathname For example, page_cache_directory = Rails.root.join("public/cache") Signed-off-by: Santiago Pastorino --- actionpack/lib/action_controller/caching/pages.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/caching/pages.rb') diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb index 3e57d2c236..8c583c7ce0 100644 --- a/actionpack/lib/action_controller/caching/pages.rb +++ b/actionpack/lib/action_controller/caching/pages.rb @@ -106,7 +106,7 @@ module ActionController #:nodoc: end def page_cache_path(path, extension = nil) - page_cache_directory + page_cache_file(path, extension) + page_cache_directory.to_s + page_cache_file(path, extension) end def instrument_page_cache(name, path) -- cgit v1.2.3