diff options
| author | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-12-03 19:30:35 +0100 |
|---|---|---|
| committer | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-12-03 19:30:35 +0100 |
| commit | ccb96f2297e8783165cba764e9b5d51e1a15ff87 (patch) | |
| tree | 3229e6fdddc42054615514d843c555e341003033 /actionpack/Rakefile | |
| parent | fb2325e35855d62abd2c76ce03feaa3ca7992e4f (diff) | |
| parent | 761a633a9c0a45d76ef3ed10da97e3696c3ded79 (diff) | |
| download | rails-ccb96f2297e8783165cba764e9b5d51e1a15ff87.tar.gz rails-ccb96f2297e8783165cba764e9b5d51e1a15ff87.tar.bz2 rails-ccb96f2297e8783165cba764e9b5d51e1a15ff87.zip | |
Merge commit 'origin/master' into savepoints
Conflicts:
activerecord/lib/active_record/fixtures.rb
activerecord/test/cases/defaults_test.rb
Diffstat (limited to 'actionpack/Rakefile')
| -rw-r--r-- | actionpack/Rakefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile index 73da8b1ce3..1a1b908122 100644 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -80,7 +80,8 @@ spec = Gem::Specification.new do |s| s.has_rdoc = true s.requirements << 'none' - s.add_dependency('activesupport', '= 2.2.0' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.3.0' + PKG_BUILD) + s.add_dependency('rack', '= 0.4.0') s.require_path = 'lib' s.autorequire = 'action_controller' |