aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 4a840a57b5..b421fedc96 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,12 @@
+* Add new error class `TransactionTimeout` for MySQL adapter which will be raised
+ when lock wait time expires.
+
+ *Gabriel Courtemanche*
+
+* Remove deprecated `#migration_keys`.
+
+ *Ryuta Kamizono*
+
* Automatically guess the inverse associations for STI.
*Yuichiro Kaneko*