Permalink
Browse files

Update to Rails master

  • Loading branch information...
1 parent fb8c749 commit aa84606b494a01f48043bfa0109b884cef93dcbf Rafael Mendonça França committed Nov 27, 2012
View
2 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'
View
7 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

0 comments on commit aa84606

Please sign in to comment.