aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorGodfrey Chan <godfreykfc@gmail.com>2014-01-18 14:26:17 -0800
committerGodfrey Chan <godfreykfc@gmail.com>2014-01-18 14:26:17 -0800
commit3c354bd83b2f429e8fa20c8cf3ae1fd8b1c736f2 (patch)
tree8bb212033c613dc78e9f8d808254537fa62f2193 /activerecord/CHANGELOG.md
parent35b85d2e7dee6688be3f22fca4d28967a2ca81ce (diff)
parent7386ffc781fca07a0c656db49fdb54678caef809 (diff)
downloadrails-3c354bd83b2f429e8fa20c8cf3ae1fd8b1c736f2.tar.gz
rails-3c354bd83b2f429e8fa20c8cf3ae1fd8b1c736f2.tar.bz2
rails-3c354bd83b2f429e8fa20c8cf3ae1fd8b1c736f2.zip
Merge pull request #13751 from chancancode/ar_rollback_fix
Restore ActiveRecord states after a rollback for models w/o callbacks
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index d289f616b8..304c48bf44 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,11 @@
+* ActiveRecord states are now correctly restored after a rollback for
+ models that did not define any transactional callbacks (i.e.
+ `after_commit`, `after_rollback` or `after_create`).
+
+ Fixes #13744.
+
+ *Godfrey Chan*
+
* Make `touch` fire the `after_commit` and `after_rollback` callbacks.
*Harry Brundage*