Merge commit 'rails/master'

2 files changed, 2 insertions, 8 deletions

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index f6954813a4..85f7cbfad2 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -2528,13 +2528,6 @@ module ActiveRecord #:nodoc:
         (id = self.id) ? id.to_s : nil # Be sure to stringify the id for routes
       end
 
-      # Returns the ActiveRecord object when asked for its
-      # ActiveModel-compliant representation, because ActiveRecord is
-      # ActiveModel-compliant.
-      def to_model
-        self
-      end
-
       # Returns a cache key that can be used to identify this record.
       #
       # ==== Examples
@@ -3215,6 +3208,7 @@ module ActiveRecord #:nodoc:
     include Dirty
     include Callbacks, ActiveModel::Observing, Timestamp
     include Associations, AssociationPreload, NamedScope
+    include ActiveModel::Conversion
 
     # AutosaveAssociation needs to be included before Transactions, because we want
     # #save_with_autosave_associations to be wrapped inside a transaction.
diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb
index 01e41c04df..3aa0b8f1b5 100644
--- a/activerecord/lib/active_record/callbacks.rb
+++ b/activerecord/lib/active_record/callbacks.rb
@@ -349,7 +349,7 @@ module ActiveRecord
           result = send(method)
         end
 
-        notify(method)
+        notify_observers(method)
 
         return result
       end