aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-05-20 16:00:16 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-05-20 16:01:21 -0700
commitb46c9071c382b48c5ff349fbe61854683663a866 (patch)
tree4dd18b1fadc28f252890932294650cf66f36625f /actionpack
parent77d955c51740216131fc0b130d5cb37fcd18d071 (diff)
downloadrails-b46c9071c382b48c5ff349fbe61854683663a866.tar.gz
rails-b46c9071c382b48c5ff349fbe61854683663a866.tar.bz2
rails-b46c9071c382b48c5ff349fbe61854683663a866.zip
Ruby 1.9 stdlib gems don't recognize .pre yet
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index f9003c51ea..ee162765cb 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -27,7 +27,7 @@ require 'active_support'
begin
gem 'rack', '~> 1.1.pre'
-rescue Gem::LoadError
+rescue Gem::LoadError, ArgumentError
$:.unshift "#{File.dirname(__FILE__)}/action_dispatch/vendor/rack-1.1.pre"
end