diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-15 17:36:54 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-15 17:36:54 -0700 |
| commit | 71f7e75d95c47e4283a7cac0a2f776abf0a11d0e (patch) | |
| tree | 75a9b6825f9f81a9bec372af8db097b6ea022fc6 /actionpack/Gemfile | |
| parent | 2d7abe245e7a2b1717e48ef550e4083318fd7ec2 (diff) | |
| parent | ef70ad5538c4ce02c4d31ef01a8db6b55c837571 (diff) | |
| download | rails-71f7e75d95c47e4283a7cac0a2f776abf0a11d0e.tar.gz rails-71f7e75d95c47e4283a7cac0a2f776abf0a11d0e.tar.bz2 rails-71f7e75d95c47e4283a7cac0a2f776abf0a11d0e.zip | |
Merge branch 'master' into orchestra
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") |