diff options
author | José Valim <jose.valim@gmail.com> | 2010-03-08 21:06:26 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-03-08 21:06:26 +0100 |
commit | 7942e909608f24db0365943c5d9ad51cbb4d27b5 (patch) | |
tree | 6a9b51155b9220dbf98d4b1c78d8edccabd231c5 /actionpack/lib/action_view.rb | |
parent | 36eb1a686c831d5a14998bb9ac7cc60efa363373 (diff) | |
parent | ae93789d9ad9095ca21784287464b760db12a095 (diff) | |
download | rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.tar.gz rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.tar.bz2 rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.zip |
Merge master.
Diffstat (limited to 'actionpack/lib/action_view.rb')
-rw-r--r-- | actionpack/lib/action_view.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb index c37cea824a..7e9ac8720c 100644 --- a/actionpack/lib/action_view.rb +++ b/actionpack/lib/action_view.rb @@ -42,12 +42,13 @@ module ActionView autoload :Rendering end - autoload :LookupContext, 'action_view/lookup_context' - autoload :MissingTemplate, 'action_view/base' - autoload :Resolver, 'action_view/template/resolver' - autoload :PathResolver, 'action_view/template/resolver' - autoload :PathSet, 'action_view/paths' - autoload :FileSystemResolverWithFallback, 'action_view/template/resolver' + 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 :TemplateError, 'action_view/template/error' autoload :TemplateHandler, 'action_view/template' @@ -58,6 +59,5 @@ module ActionView end require 'active_support/core_ext/string/output_safety' -require 'action_view/base' I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml" |