diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2013-03-25 20:16:00 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2013-03-25 20:16:00 -0700 |
| commit | 078bfbffa41e29a9d8ff2cf56e4c9254e7260f24 (patch) | |
| tree | 103457a1b46701e5d2aeb8a03155795585016392 | |
| parent | 2e68ecccf7ef86833cab2a99b0a42688f3fe88ac (diff) | |
| parent | 4ed4cfd5ed426eb83e2bfd9a185d7476ca4905db (diff) | |
| download | rails-078bfbffa41e29a9d8ff2cf56e4c9254e7260f24.tar.gz rails-078bfbffa41e29a9d8ff2cf56e4c9254e7260f24.tar.bz2 rails-078bfbffa41e29a9d8ff2cf56e4c9254e7260f24.zip | |
Merge pull request #9930 from kennyj/bump_tzinfo
Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data.
| -rw-r--r-- | actionpack/actionpack.gemspec | 2 | ||||
| -rw-r--r-- | activesupport/activesupport.gemspec | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index 03eeb841ee..cc8351a489 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -26,5 +26,5 @@ Gem::Specification.new do |s| s.add_dependency 'erubis', '~> 2.7.0' s.add_development_dependency 'activemodel', version - s.add_development_dependency 'tzinfo', '~> 0.3.33' + s.add_development_dependency 'tzinfo', '~> 0.3.37' end diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index a28310032a..b46a331f6a 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.add_dependency('i18n', '~> 0.6', '>= 0.6.4') s.add_dependency 'multi_json', '~> 1.3' - s.add_dependency 'tzinfo', '~> 0.3.33' + s.add_dependency 'tzinfo', '~> 0.3.37' s.add_dependency 'minitest', '~> 4.2' s.add_dependency 'thread_safe','~> 0.1' end |