aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-02-10 14:46:36 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-02-10 14:46:36 -0200
commite063dbc602796c1dcc1d657cefe31d84e45d609f (patch)
tree333ea0c8c4c567b7d2ec789d4c16ca0bc866104e /activesupport/CHANGELOG.md
parent3b868cc99d4e417ac2090529ba41c4918454913d (diff)
parentae28e4beb3d9b395ee269999111b6598802da63f (diff)
downloadrails-e063dbc602796c1dcc1d657cefe31d84e45d609f.tar.gz
rails-e063dbc602796c1dcc1d657cefe31d84e45d609f.tar.bz2
rails-e063dbc602796c1dcc1d657cefe31d84e45d609f.zip
Merge pull request #13919 from jcoyne/fix_jruby_encoding
Fix tidy_bytes for JRuby
Diffstat (limited to 'activesupport/CHANGELOG.md')
-rw-r--r--activesupport/CHANGELOG.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 9a62bd5a77..43bfeff079 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,10 @@
+* Fix the implementation of Multibyte::Unicode.tidy_bytes for JRuby
+
+ The existing implementation caused JRuby to raise the error:
+ `Encoding::ConverterNotFoundError: code converter not found (UTF-8 to UTF8-MAC)`
+
+ *Justin Coyne*
+
* Fix `to_param` behavior when there are nested empty hashes.
Before: