aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2017-10-23 15:33:16 -0400
committerRafael Mendonça França <rafaelmfranca@gmail.com>2017-10-23 15:33:16 -0400
commit9c5c0596f137c396b6356416a3f92a3a082c53f6 (patch)
tree2aeea8ba25b27f03969a4d5e253e662b48dbcacd /activesupport/CHANGELOG.md
parentc085a2a1a2a9ecfe8f9acfc177798046087c269e (diff)
parent813f8e333dabb2050d6b668b7bdd68b4979e8af4 (diff)
downloadrails-9c5c0596f137c396b6356416a3f92a3a082c53f6.tar.gz
rails-9c5c0596f137c396b6356416a3f92a3a082c53f6.tar.bz2
rails-9c5c0596f137c396b6356416a3f92a3a082c53f6.zip
Merge pull request #30953 from rohitpaulk/fix-io-to-json
Fix #to_json for IO objects, fixes #26132
Diffstat (limited to 'activesupport/CHANGELOG.md')
-rw-r--r--activesupport/CHANGELOG.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index f57b9ce5ab..8e8e9b9440 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,11 @@
+* `IO#to_json` now returns the `to_s` representation, rather than
+ attempting to convert to an array. This fixes a bug where `IO#to_json`
+ would raise an `IOError` when called on an unreadable object.
+
+ Fixes #26132.
+
+ *Paul Kuruvilla*
+
* Remove deprecated `halt_callback_chains_on_return_false` option.
*Rafael Mendonça França*