diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-11-27 02:07:54 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-11-27 02:07:54 -0800 |
| commit | cb09a2746745345f24e1b8e465bdef06acf318de (patch) | |
| tree | a737711b4106bc8dc763f33f7988c0f91f95eb8d | |
| parent | 260471a5e1b00136fc2d6e66bab29059fc6d8174 (diff) | |
| parent | 78cd3b0e538d7e0d3ca7869e796d98266afcd6b4 (diff) | |
| download | rails-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.
| -rw-r--r-- | activesupport/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activesupport/activesupport.gemspec | 4 |
2 files changed, 6 insertions, 2 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 diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index c27c50e47b..4fdc697a15 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -20,8 +20,8 @@ Gem::Specification.new do |s| s.rdoc_options.concat ['--encoding', 'UTF-8'] - s.add_dependency('i18n', '~> 0.6', '>= 0.6.4') - s.add_dependency 'json', '~> 1.7' + s.add_dependency 'i18n', '~> 0.6', '>= 0.6.4' + s.add_dependency 'json', '~> 1.7', '>= 1.7.7' s.add_dependency 'tzinfo', '~> 1.1' s.add_dependency 'minitest', '~> 5.0' s.add_dependency 'thread_safe','~> 0.1' |