diff options
| author | Gonçalo Silva <goncalossilva@gmail.com> | 2011-05-08 03:54:55 +0100 |
|---|---|---|
| committer | Gonçalo Silva <goncalossilva@gmail.com> | 2011-05-08 03:54:55 +0100 |
| commit | aec7456f81985b88d6d604679d754636183b5b3a (patch) | |
| tree | 798fcab8ae0c6e2c8c5a63e1f39308ff4bb5a20c /actionpack/actionpack.gemspec | |
| parent | 1c2b2233c3a7ec76c0a0eddf5b8be45c489be133 (diff) | |
| parent | 70f9558d0e4b8e605576693cbb489caa5cf6a2bc (diff) | |
| download | rails-aec7456f81985b88d6d604679d754636183b5b3a.tar.gz rails-aec7456f81985b88d6d604679d754636183b5b3a.tar.bz2 rails-aec7456f81985b88d6d604679d754636183b5b3a.zip | |
Merge branch 'master' of https://github.com/rails/rails into performance_test
Conflicts:
activesupport/lib/active_support/testing/performance.rb
Diffstat (limited to 'actionpack/actionpack.gemspec')
| -rw-r--r-- | actionpack/actionpack.gemspec | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index d3c66800d9..fdd894fe63 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -19,12 +19,13 @@ Gem::Specification.new do |s| s.add_dependency('activesupport', version) s.add_dependency('activemodel', version) - s.add_dependency('rack-cache', '~> 1.0.0') + s.add_dependency('rack-cache', '~> 1.0.1') s.add_dependency('builder', '~> 3.0.0') - s.add_dependency('i18n', '~> 0.5.0') - s.add_dependency('rack', '~> 1.2.1') - s.add_dependency('rack-test', '~> 0.5.7') - s.add_dependency('rack-mount', '~> 0.7.1') - s.add_dependency('tzinfo', '~> 0.3.23') + s.add_dependency('i18n', '~> 0.6.0beta1') + s.add_dependency('rack', '~> 1.3.0.beta') + s.add_dependency('rack-test', '~> 0.6.0') + s.add_dependency('rack-mount', '~> 0.7.2') + s.add_dependency('sprockets', '~> 2.0.0.beta.2') + s.add_dependency('tzinfo', '~> 0.3.27') s.add_dependency('erubis', '~> 2.7.0') end |