diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-30 12:40:32 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-30 12:40:32 -0800 |
| commit | d9615928866115015e9ec48ac88a90869ef85d9b (patch) | |
| tree | e6783aeeb36f1b8263d97d2548a39a4e5ee58fa6 /actionpack/lib/action_controller/rescue.rb | |
| parent | 276ec16007b03d0a527fb0b83a7ee0b81e460fa1 (diff) | |
| parent | 82443ecfad5e756da922d6a166b0093c8a74d720 (diff) | |
| download | rails-d9615928866115015e9ec48ac88a90869ef85d9b.tar.gz rails-d9615928866115015e9ec48ac88a90869ef85d9b.tar.bz2 rails-d9615928866115015e9ec48ac88a90869ef85d9b.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/rescue.rb')
| -rw-r--r-- | actionpack/lib/action_controller/rescue.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index 3a5e5071bb..de35b53872 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -38,8 +38,8 @@ module ActionController #:nodoc: 'ActionView::TemplateError' => 'template_error' } - RESCUES_TEMPLATE_PATH = ActionView::PathSet::Path.new( - File.join(File.dirname(__FILE__), "templates"), true) + RESCUES_TEMPLATE_PATH = ActionView::Template::EagerPath.new( + File.join(File.dirname(__FILE__), "templates")) def self.included(base) #:nodoc: base.cattr_accessor :rescue_responses |