aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2009-12-24 15:24:57 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2009-12-24 15:24:57 -0800
commit38af368360ab35600ef69b21d85ae9604e6ebb22 (patch)
treece198e83d0523584f7def682bff537c9893e0099 /actionpack/lib/action_view.rb
parent2b7256a42e63640d6e94fe80ee67093ed0f06e4c (diff)
parent46b376962f064077734773c7e1eea5881e5d5696 (diff)
downloadrails-38af368360ab35600ef69b21d85ae9604e6ebb22.tar.gz
rails-38af368360ab35600ef69b21d85ae9604e6ebb22.tar.bz2
rails-38af368360ab35600ef69b21d85ae9604e6ebb22.zip
Merge
Diffstat (limited to 'actionpack/lib/action_view.rb')
-rw-r--r--actionpack/lib/action_view.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index f57f9ca229..8ce6e82524 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -32,7 +32,6 @@ module ActionView
extend ActiveSupport::Autoload
eager_autoload do
- autoload :Base
autoload :Context
autoload :Template
autoload :Helpers
@@ -56,5 +55,6 @@ module ActionView
end
require 'action_view/erb/util'
+require 'action_view/base'
I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"