Remove ActiveRecord::Base.reset since Dispatcher doesn't use it anymore. [Rick Olson]

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

3 files changed, 3 insertions, 13 deletions

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 0b4f8e1a00..3f2ac9fa3b 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Remove ActiveRecord::Base.reset since Dispatcher doesn't use it anymore.  [Rick Olson]
+
 * Document find's :from option. Closes #5762. [andrew@redlinesoftware.com]
 
 * PostgreSQL: autodetected sequences work correctly with multiple schemas. Rely on the schema search_path instead of explicitly qualifying the sequence name with its schema.  #5280 [guy.naor@famundo.com]
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 0342e9bb4e..4a0ef4c203 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -272,10 +272,6 @@ module ActiveRecord #:nodoc:
       super
     end
     
-    def self.reset
-      reset_subclasses
-    end
-    
     def self.reset_subclasses #:nodoc:
       nonreloadables = []
       subclasses.each do |klass|
diff --git a/activerecord/lib/active_record/observer.rb b/activerecord/lib/active_record/observer.rb
index e8ab95642f..b472423b88 100644
--- a/activerecord/lib/active_record/observer.rb
+++ b/activerecord/lib/active_record/observer.rb
@@ -4,18 +4,10 @@ require 'set'
 module ActiveRecord
   module Observing # :nodoc:
     def self.included(base)
-      class << base
-        include ClassMethods
-        alias_method_chain :reset, :observers
-      end
+      base.extend ClassMethods
     end
 
     module ClassMethods
-      def reset_with_observers # :nodoc:
-        reset_without_observers
-        instantiate_observers
-      end
-      
       # Activates the observers assigned. Examples:
       #
       #   # Calls PersonObserver.instance