diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-07-21 00:51:57 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-07-21 00:51:57 -0500 |
commit | 92c00d75869b173f44ff9d68f219a99e6dc3bd82 (patch) | |
tree | a5c11b3810d7739de8dcac6cedaa2879810de4a8 /activerecord/lib/active_record/base.rb | |
parent | 6944b391cddbf1a3ffb3ac4ac588fa4b3d50f430 (diff) | |
download | rails-92c00d75869b173f44ff9d68f219a99e6dc3bd82.tar.gz rails-92c00d75869b173f44ff9d68f219a99e6dc3bd82.tar.bz2 rails-92c00d75869b173f44ff9d68f219a99e6dc3bd82.zip |
AMo conversion helper
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rwxr-xr-x | activerecord/lib/active_record/base.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index f32857afa3..62e97158ec 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -2511,13 +2511,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 @@ -3186,6 +3179,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. |