aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view.rb
diff options
context:
space:
mode:
authorRizwan Reza <rizwanreza@gmail.com>2010-03-28 12:04:00 +0430
committerRizwan Reza <rizwanreza@gmail.com>2010-03-28 12:04:00 +0430
commitb4c91de9462f59d6395c7c871aafa3301afdc383 (patch)
treefadcaf603a6f473e8ccd52070a1f3b4f957c34cb /actionpack/lib/action_view.rb
parent4b4f69b9bfbd33556e23262f57cf6d944dfd9f63 (diff)
parent66d57d7ba83df52ff1e0485c89f6192c2f84c6b8 (diff)
downloadrails-b4c91de9462f59d6395c7c871aafa3301afdc383.tar.gz
rails-b4c91de9462f59d6395c7c871aafa3301afdc383.tar.bz2
rails-b4c91de9462f59d6395c7c871aafa3301afdc383.zip
Merge remote branch 'rails/master'
Diffstat (limited to 'actionpack/lib/action_view.rb')
-rw-r--r--actionpack/lib/action_view.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index afe6386105..5555217ee2 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -44,13 +44,15 @@ module ActionView
autoload :Base
autoload :LookupContext
- autoload :MissingTemplate, 'action_view/base'
autoload :Resolver, 'action_view/template/resolver'
autoload :PathResolver, 'action_view/template/resolver'
autoload :FileSystemResolver, 'action_view/template/resolver'
autoload :PathSet, 'action_view/paths'
+ autoload :MissingTemplate, 'action_view/template/error'
+ autoload :ActionViewError, 'action_view/template/error'
autoload :TemplateError, 'action_view/template/error'
+
autoload :TemplateHandler, 'action_view/template'
autoload :TemplateHandlers, 'action_view/template'
end