From 69266a063bfa63408b0ea2453c699b7ad5531d86 Mon Sep 17 00:00:00 2001
From: Rick Olson <technoweenie@gmail.com>
Date: Wed, 9 Aug 2006 16:54:36 +0000
Subject: 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
---
 activerecord/lib/active_record/base.rb     |  4 ----
 activerecord/lib/active_record/observer.rb | 10 +---------
 2 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'activerecord/lib')

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
-- 
cgit v1.2.3