aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-12-22 15:45:10 -0600
committerJoshua Peek <josh@joshpeek.com>2009-12-22 15:46:15 -0600
commit17b6053083767e5747c0f522b83a69e268d9d69e (patch)
treed68cd108adff5ad55c5eb4410d27a417d21b8395
parent4964d3b02cd5c87d821ab7d41d243154c727185d (diff)
downloadrails-17b6053083767e5747c0f522b83a69e268d9d69e.tar.gz
rails-17b6053083767e5747c0f522b83a69e268d9d69e.tar.bz2
rails-17b6053083767e5747c0f522b83a69e268d9d69e.zip
Float on rack/master in preparation for rack 1.1 gem release
-rw-r--r--Gemfile2
-rw-r--r--actionpack/actionpack.gemspec2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index d979add5b3..7ef6c2e6f2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem "pg", ">= 0.8.0"
gem "mysql", ">= 2.8.1"
# AP
-gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git"
+gem "rack", "1.1.0", :git => "git://github.com/rack/rack.git"
gem "RedCloth", ">= 4.2.2"
if ENV['CI']
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 23d478fd44..1294cd4993 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
s.add_dependency('activesupport', '= 3.0.pre')
s.add_dependency('activemodel', '= 3.0.pre')
- s.add_dependency('rack', '~> 1.0.1')
+ s.add_dependency('rack', '~> 1.1.0')
s.add_dependency('rack-test', '~> 0.5.0')
s.add_dependency('rack-mount', '~> 0.3.2')
s.add_dependency('erubis', '~> 2.6.5')