r3023@asus: jeremy | 2005-07-12 23:43:39 -0700

 Remove superfluous inherited override in Dependencies.
 r3024@asus:  jeremy | 2005-07-12 23:54:28 -0700
 Make test the default railties rake target.
 r3025@asus:  jeremy | 2005-07-12 23:55:27 -0700
 Encapsulate dispatch call in dispatcher test.
 r3026@asus:  jeremy | 2005-07-12 23:56:14 -0700
 Expand dispatcher mock to match full method signature for process.
 r3027@asus:  jeremy | 2005-07-12 23:57:24 -0700
 Look for app-specific generators in RAILS_ROOT/generators instead of RAILS_ROOT/script/generators.
 r3028@asus:  jeremy | 2005-07-13 00:00:47 -0700
 Update changelog.


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

1 files changed, 0 insertions, 5 deletions

diff --git a/actionpack/lib/action_controller/dependencies.rb b/actionpack/lib/action_controller/dependencies.rb
index 2960330afa..5132bccd62 100644
--- a/actionpack/lib/action_controller/dependencies.rb
+++ b/actionpack/lib/action_controller/dependencies.rb
@@ -2,7 +2,6 @@ module ActionController #:nodoc:
   module Dependencies #:nodoc:
     def self.append_features(base)
       super
-      base.class_eval { class << self; alias_method :inherited_without_model, :inherited; end }
       base.extend(ClassMethods)
     end
 
@@ -79,10 +78,6 @@ module ActionController #:nodoc:
             end
           end
         end
-
-        def inherited(child)
-          inherited_without_model(child)
-        end        
     end
   end
 end