Update to Rails master

af83 · Nov 27, 2012 · aa84606 · aa84606
1 parent fb8c749
commit aa84606
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/lib/rails/observers/activerecord/active_record.rb b/lib/rails/observers/activerecord/active_record.rb
@@ -1,4 +1,4 @@
-require 'rails/observers/activerecord/model'
+require 'rails/observers/activerecord/base'
 
 module ActiveRecord
   autoload :Observer, 'rails/observers/activerecord/observer'

diff --git a/lib/rails/observers/activerecord/model.rb → lib/rails/observers/activerecord/base.rb b/lib/rails/observers/activerecord/model.rb → lib/rails/observers/activerecord/base.rb
@@ -1,13 +1,6 @@
 require 'rails/observers/active_model/active_model'
 
 module ActiveRecord
-  module Model
-    included do
-      extend ActiveModel::Observing::ClassMethods
-      include ActiveModel::Observing
-    end
-  end
-
   class Base
     extend ActiveModel::Observing::ClassMethods
     include ActiveModel::Observing