An explicit include ClassInheritableAttributes is no longer needed #1948 [Caleb Tennis]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2154 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 0 insertions, 6 deletions

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 5fbbab8647..b9bab6229a 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -208,8 +208,6 @@ module ActionController #:nodoc:
   #
   #   FCGI.each_cgi{ |cgi| WeblogController.process_cgi(cgi) }
   class Base
-    include ClassInheritableAttributes
-  
     DEFAULT_RENDER_STATUS_CODE = "200 OK"
   
     # Determines whether the view has access to controller internals @request, @response, @session, and @template.
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 22870a5263..f11fca69f4 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -226,8 +226,6 @@ module ActiveRecord #:nodoc:
   # So it's possible to assign a logger to the class through Base.logger= which will then be used by all
   # instances in the current object space.
   class Base
-    include ClassInheritableAttributes
-
     # Accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then passed
     # on to any new database connections made and which can be retrieved on both a class and instance level by calling +logger+.
     cattr_accessor :logger
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index fd1de46c1d..1e5fc8b08b 100755
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -399,8 +399,6 @@ end
 module Test #:nodoc:
   module Unit #:nodoc:
     class TestCase #:nodoc:
-      include ClassInheritableAttributes
-
       cattr_accessor :fixture_path
       class_inheritable_accessor :fixture_table_names
       class_inheritable_accessor :use_transactional_fixtures