diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-06-11 10:06:47 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-06-11 10:06:47 +0000 |
| commit | d79838fdcbe4c6a2a424b79309fe4623ccdd4a76 (patch) | |
| tree | 9dffc190e11cd5fa9c46f8746101e2e38cbf81f2 /activerecord/lib | |
| parent | 2c0fa3208859aed2c1fd0ce54c8d5215d11d0c75 (diff) | |
| download | rails-d79838fdcbe4c6a2a424b79309fe4623ccdd4a76.tar.gz rails-d79838fdcbe4c6a2a424b79309fe4623ccdd4a76.tar.bz2 rails-d79838fdcbe4c6a2a424b79309fe4623ccdd4a76.zip | |
Allow before/after update hooks to work on models with optimistic locking
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1400 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
| -rwxr-xr-x | activerecord/lib/active_record.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |