diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-01-10 18:43:27 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-01-10 18:43:27 +0000 |
| commit | b6f33d6bf80c27c7fd9d597cbac00ce7e77805c2 (patch) | |
| tree | caf315b50e65fdb1e82a2d92454d335097c364f8 /actionpack/Rakefile | |
| parent | a5981517e6676818c3031834627e4a0763ce4fba (diff) | |
| parent | 40a75a509187b6759099a3644b7ae8db9fc14045 (diff) | |
| download | rails-b6f33d6bf80c27c7fd9d597cbac00ce7e77805c2.tar.gz rails-b6f33d6bf80c27c7fd9d597cbac00ce7e77805c2.tar.bz2 rails-b6f33d6bf80c27c7fd9d597cbac00ce7e77805c2.zip | |
Merge commit 'mainstream/master'
Conflicts:
activerecord/lib/active_record/base.rb
Diffstat (limited to 'actionpack/Rakefile')
| -rw-r--r-- | actionpack/Rakefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile index 1a1b908122..c389e5a8d6 100644 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -81,7 +81,7 @@ spec = Gem::Specification.new do |s| s.requirements << 'none' s.add_dependency('activesupport', '= 2.3.0' + PKG_BUILD) - s.add_dependency('rack', '= 0.4.0') + s.add_dependency('rack', '>= 0.9.0') s.require_path = 'lib' s.autorequire = 'action_controller' |