Change config implementation in AV slightly

actionmailer/test/abstract_unit.rb

@@ -20,7 +20,7 @@
 ActionView::Template.register_template_handler :haml, lambda { |template| "Look its HAML!".inspect }
 ActionView::Template.register_template_handler :bak, lambda { |template| "Lame backup".inspect }
 
-ActionView::Base.config = { :assets_dir => '/nowhere' }
+ActionView::Base::DEFAULT_CONFIG = { :assets_dir => '/nowhere' }
 
 $:.unshift "#{File.dirname(__FILE__)}/fixtures/helpers"
 

actionpack/lib/action_view/base.rb

@@ -167,7 +167,16 @@ class Base
     module Subclasses
     end
 
-    include Helpers, Rendering, Partials, ::ERB::Util, ActiveSupport::Configurable
+    include Helpers, Rendering, Partials, ::ERB::Util
+
+    def config
+      self.config = DEFAULT_CONFIG unless @config
+      @config
+    end
+
+    def config=(config)
+      @config = ActiveSupport::OrderedOptions.new.merge(config)
+    end
 
     extend ActiveSupport::Memoizable