aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-02-15 21:49:00 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-02-15 21:49:00 -0200
commit8b80e3c59c0b3cd788aa674508fff28d29fda6a0 (patch)
tree101d16b4ee6f30275675c89749424e4a033ed66c /activerecord
parent4914adc2b0f0c6338f0763e364db02dcf7d49255 (diff)
parent0c63fbcdf131dddf696248498e87c0513b43daca (diff)
downloadrails-8b80e3c59c0b3cd788aa674508fff28d29fda6a0.tar.gz
rails-8b80e3c59c0b3cd788aa674508fff28d29fda6a0.tar.bz2
rails-8b80e3c59c0b3cd788aa674508fff28d29fda6a0.zip
Merge pull request #14072 from robin850/patch-16
Add a missing changelog entry for #13981 and #14035
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index d8bb31a3a7..f1f9cf1ffd 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,10 @@
+* Properly detect if a connection is still active before using it
+ in multi-threaded environments.
+
+ Fixes #12867.
+
+ *Kevin Casey*, *Matthew Draper*, *William (B.J.) Snow Orvis*
+
* When inverting add_index use the index name if present instead of
the columns.