diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-09 09:05:59 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-09 09:05:59 -0800 |
| commit | b02c87ef2a22f01b4dcaae2663ed64284880b8fc (patch) | |
| tree | 536a82c447836ffae299070ed6776d62a663b00a | |
| parent | b171db87e2e651602d8f2cf7fd39e4f52319cf48 (diff) | |
| parent | 63dc9b46b1f71c41b6f77751c5d5dfd38430495e (diff) | |
| download | rails-b02c87ef2a22f01b4dcaae2663ed64284880b8fc.tar.gz rails-b02c87ef2a22f01b4dcaae2663ed64284880b8fc.tar.bz2 rails-b02c87ef2a22f01b4dcaae2663ed64284880b8fc.zip | |
Merge pull request #4973 from kennyj/fix_4909
Fix GH #4909. Dependency on TZInfo move from AR to AS.
| -rw-r--r-- | activerecord/activerecord.gemspec | 1 | ||||
| -rw-r--r-- | activesupport/activesupport.gemspec | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec index 8484e1093e..8f4c957dbd 100644 --- a/activerecord/activerecord.gemspec +++ b/activerecord/activerecord.gemspec @@ -22,5 +22,4 @@ Gem::Specification.new do |s| s.add_dependency('activesupport', version) s.add_dependency('activemodel', version) s.add_dependency('arel', '~> 3.0.0') - s.add_dependency('tzinfo', '~> 0.3.29') end diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index 61a88bd65b..3c2402c136 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -20,4 +20,5 @@ Gem::Specification.new do |s| s.add_dependency('i18n', '~> 0.6') s.add_dependency('multi_json', '~> 1.0') + s.add_dependency('tzinfo', '~> 0.3.29') end |