aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG.md
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-11-27 02:07:54 -0800
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-11-27 02:07:54 -0800
commitcb09a2746745345f24e1b8e465bdef06acf318de (patch)
treea737711b4106bc8dc763f33f7988c0f91f95eb8d /activesupport/CHANGELOG.md
parent260471a5e1b00136fc2d6e66bab29059fc6d8174 (diff)
parent78cd3b0e538d7e0d3ca7869e796d98266afcd6b4 (diff)
downloadrails-cb09a2746745345f24e1b8e465bdef06acf318de.tar.gz
rails-cb09a2746745345f24e1b8e465bdef06acf318de.tar.bz2
rails-cb09a2746745345f24e1b8e465bdef06acf318de.zip
Merge pull request #13069 from chancancode/json_gem_version
Requires JSON gem version 1.7.7 or above as it contains an important security fix.
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 104b5eafa1..09cee39bca 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Requires JSON gem version 1.7.7 or above due to a security issue in older versions.
+
+ *Godfrey Chan*
+
* Add `ActiveSupport::Testing::TimeHelpers#travel` and `#travel_to`. These methods change current
time to the given time or time difference by stubbing `Time.now` and `Date.today` to return the
time or date after the difference calculation, or the time or date that got passed into the