diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-06-12 16:20:27 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-06-12 16:20:27 -0300 |
| commit | a924b2f66e955dcc82b691ca5e48ef5b84035286 (patch) | |
| tree | 8ea40389c9cae3568652a17d6892169179eb8bad /activerecord/lib/active_record/base.rb | |
| parent | 247ac954132222fdd399cddc264bc1d4029f750c (diff) | |
| parent | 8f7c657f4b1c037348b24f0b9dd1e45099fbc760 (diff) | |
| download | rails-a924b2f66e955dcc82b691ca5e48ef5b84035286.tar.gz rails-a924b2f66e955dcc82b691ca5e48ef5b84035286.tar.bz2 rails-a924b2f66e955dcc82b691ca5e48ef5b84035286.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 4f0c11d883..4e7979cfff 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -3247,7 +3247,7 @@ module ActiveRecord #:nodoc: include Locking::Optimistic, Locking::Pessimistic include AttributeMethods include Dirty - include Callbacks, Observing, Timestamp + include Callbacks, ActiveModel::Observing, Timestamp include Associations, AssociationPreload, NamedScope # AutosaveAssociation needs to be included before Transactions, because we want |