diff options
author | José Valim <jose.valim@gmail.com> | 2009-10-16 01:08:18 -0300 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-10-16 01:08:18 -0300 |
commit | 9ba83cce0318fa5051764f4a16c286adf30169e2 (patch) | |
tree | b1158e6916d69687c1b3e003aa97534a9135f460 /actionpack/Gemfile | |
parent | 8b340ab2f62bac2af9d5917e296bb4101530282a (diff) | |
parent | ef70ad5538c4ce02c4d31ef01a8db6b55c837571 (diff) | |
download | rails-9ba83cce0318fa5051764f4a16c286adf30169e2.tar.gz rails-9ba83cce0318fa5051764f4a16c286adf30169e2.tar.bz2 rails-9ba83cce0318fa5051764f4a16c286adf30169e2.zip |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/Gemfile')
-rw-r--r-- | actionpack/Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/Gemfile b/actionpack/Gemfile index 3cf6e6e333..506458365f 100644 --- a/actionpack/Gemfile +++ b/actionpack/Gemfile @@ -2,7 +2,7 @@ rails_root = Pathname.new(File.dirname(__FILE__)).join("..") Gem.sources.each { |uri| source uri } -gem "rack", "~> 1.0.0" +gem "rack", "1.0.1", :git => "git://github.com/rack/rack.git", :branch => "rack-1.0" gem "rack-test", "~> 0.5.0" gem "activesupport", "3.0.pre", :vendored_at => rails_root.join("activesupport") gem "activemodel", "3.0.pre", :vendored_at => rails_root.join("activemodel") |