diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index c464f6eabb..5738815e78 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Allow before/after update hooks to work on models using optimistic locking + * Eager loading of dependent has_one associations won't delete the association #1212 * Added a second parameter to the build and create method for has_one that controls whether the existing association should be replaced (which means nullifying its foreign key as well). By default this is true, but false can be passed to prevent it. diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index a6169272a1..9d821d17e9 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -49,8 +49,8 @@ require 'active_record/migration' ActiveRecord::Base.class_eval do include ActiveRecord::Validations - include ActiveRecord::Callbacks include ActiveRecord::Locking + include ActiveRecord::Callbacks include ActiveRecord::Timestamp include ActiveRecord::Associations include ActiveRecord::Aggregations |