aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG.md
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2013-10-30 10:58:20 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2013-10-30 10:58:20 -0700
commit9e4efed6e0c3fde2944b01e558a61d5b7a188d21 (patch)
tree2df3256b8da7efc52f4da3e13300562cdd9abfcc /activesupport/CHANGELOG.md
parentdae66a0c9733a7fd2ba4357e24b03b386be3e38f (diff)
parent1fb79691548cd370e83625045a0a445c97fa0dea (diff)
downloadrails-9e4efed6e0c3fde2944b01e558a61d5b7a188d21.tar.gz
rails-9e4efed6e0c3fde2944b01e558a61d5b7a188d21.tar.bz2
rails-9e4efed6e0c3fde2944b01e558a61d5b7a188d21.zip
Merge pull request #12214 from chancancode/json_decode_does_not_take_options
Raise an error when AS::JSON.decode is called with options
Diffstat (limited to 'activesupport/CHANGELOG.md')
-rw-r--r--activesupport/CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 25667af101..2d934f8bc4 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Calling ActiveSupport::JSON.decode with unsupported options now raises an error.
+
+ *Godfrey Chan*
+
* Support :unless_exist in FileStore
*Michael Grosser*