Merge commit 'origin/master' into savepoints

Conflicts:
	activerecord/lib/active_record/fixtures.rb
	activerecord/test/cases/defaults_test.rb

1 files changed, 21 insertions, 17 deletions

diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 7cd9b633ac..210a5f1a93 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -31,23 +31,27 @@ rescue LoadError
   end
 end
 
-require 'action_view/template_handlers'
-require 'action_view/renderable'
-require 'action_view/renderable_partial'
-
-require 'action_view/template'
-require 'action_view/inline_template'
-require 'action_view/paths'
-
-require 'action_view/base'
-require 'action_view/partials'
-require 'action_view/template_error'
-
-I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en-US.yml"
+module ActionView
+  def self.load_all!
+    [Base, InlineTemplate, TemplateError]
+  end
 
-require 'action_view/helpers'
+  autoload :Base, 'action_view/base'
+  autoload :Helpers, 'action_view/helpers'
+  autoload :InlineTemplate, 'action_view/inline_template'
+  autoload :Partials, 'action_view/partials'
+  autoload :PathSet, 'action_view/paths'
+  autoload :Renderable, 'action_view/renderable'
+  autoload :RenderablePartial, 'action_view/renderable_partial'
+  autoload :Template, 'action_view/template'
+  autoload :TemplateError, 'action_view/template_error'
+  autoload :TemplateHandler, 'action_view/template_handler'
+  autoload :TemplateHandlers, 'action_view/template_handlers'
+  autoload :Helpers, 'action_view/helpers'
+end
 
-ActionView::Base.class_eval do
-  include ActionView::Partials
-  include ActionView::Helpers
+class ERB
+  autoload :Util, 'action_view/erb/util'
 end
+
+I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml"