diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-20 17:18:57 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-20 17:18:57 +0200 |
| commit | 0c75ec51a9b60252125534b8f9a3f6406713a957 (patch) | |
| tree | 34165e93f7dd01157f77e4e70a46ec6a5bed77c8 /activerecord/lib/active_record/callbacks.rb | |
| parent | 87398e531d0bb23b30787fe26d86678dba322895 (diff) | |
| parent | 2ffa50f5a9fac08e08869687006031b70322497a (diff) | |
| download | rails-0c75ec51a9b60252125534b8f9a3f6406713a957.tar.gz rails-0c75ec51a9b60252125534b8f9a3f6406713a957.tar.bz2 rails-0c75ec51a9b60252125534b8f9a3f6406713a957.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'activerecord/lib/active_record/callbacks.rb')
| -rw-r--r-- | activerecord/lib/active_record/callbacks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb index c203581735..a31973d529 100644 --- a/activerecord/lib/active_record/callbacks.rb +++ b/activerecord/lib/active_record/callbacks.rb @@ -235,7 +235,7 @@ module ActiveRecord :after_initialize, :after_find, :after_touch, :before_validation, :after_validation, :before_save, :around_save, :after_save, :before_create, :around_create, :after_create, :before_update, :around_update, :after_update, - :before_destroy, :around_destroy, :after_destroy + :before_destroy, :around_destroy, :after_destroy, :after_commit, :after_rollback ] included do |