aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG.md
diff options
context:
space:
mode:
authorPaul Kuruvilla <rohitpaulk@gmail.com>2017-10-23 15:17:31 +0530
committerPaul Kuruvilla <rohitpaulk@gmail.com>2017-10-23 15:49:00 +0530
commit813f8e333dabb2050d6b668b7bdd68b4979e8af4 (patch)
tree1bdf5e8b3e657f2cd8dd73b247724b51bb33d5fc /activesupport/CHANGELOG.md
parentf4d1aa5310284ebceb51970140fa08f6c8ea19b6 (diff)
downloadrails-813f8e333dabb2050d6b668b7bdd68b4979e8af4.tar.gz
rails-813f8e333dabb2050d6b668b7bdd68b4979e8af4.tar.bz2
rails-813f8e333dabb2050d6b668b7bdd68b4979e8af4.zip
Fix #to_json for unreadable 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 7696fdcd7a..4e713da8a8 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*
+
* `Hash#slice` now falls back to Ruby 2.5+'s built-in definition if defined.
*Akira Matsuda*