diff options
author | Joshua Peek <josh@joshpeek.com> | 2011-05-22 20:11:36 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2011-05-22 20:11:36 -0500 |
commit | 5e519fb0150e6ccb7e2486fc8aa2d60d11b53b75 (patch) | |
tree | dfadca323c6488c167d434e607caaf96c75c8a5c /actionpack/actionpack.gemspec | |
parent | ba3ea9c90b000d8520944b51b2f6d41af148090c (diff) | |
parent | 7ad24a7d962be62fc7538e8a9dc1046daf896497 (diff) | |
download | rails-5e519fb0150e6ccb7e2486fc8aa2d60d11b53b75.tar.gz rails-5e519fb0150e6ccb7e2486fc8aa2d60d11b53b75.tar.bz2 rails-5e519fb0150e6ccb7e2486fc8aa2d60d11b53b75.zip |
Merge branch '3-1-stable'
Conflicts:
actionpack/actionpack.gemspec
activemodel/activemodel.gemspec
Diffstat (limited to 'actionpack/actionpack.gemspec')
-rw-r--r-- | actionpack/actionpack.gemspec | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index 6beaec7158..68d871b6ad 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -20,10 +20,11 @@ Gem::Specification.new do |s| s.add_dependency('activemodel', version) s.add_dependency('rack-cache', '~> 1.0.1') s.add_dependency('builder', '~> 3.0.0') + s.add_dependency('i18n', '~> 0.6') s.add_dependency('rack', '~> 1.3.0.beta2') s.add_dependency('rack-test', '~> 0.6.0') s.add_dependency('rack-mount', '~> 0.8.1') - s.add_dependency('sprockets', '~> 2.0.0.beta.5') + s.add_dependency('sprockets', '~> 2.0.0.beta.8') s.add_dependency('tzinfo', '~> 0.3.27') s.add_dependency('erubis', '~> 2.7.0') end |