Permalink
Browse files

check for rack 1.0 gem before falling back to bundled version

  • Loading branch information...
1 parent 572e0aa commit 0a887e2386a827f554c685dccf91701bb38422b5 @josh josh committed Mar 10, 2009
Showing with 6 additions and 1 deletion.
  1. +6 −1 actionpack/lib/action_controller.rb
@@ -31,7 +31,12 @@
end
end
-require 'action_controller/vendor/rack-1.0/rack'
+begin
+ gem 'rack', '~> 1.0.0'
+ require 'rack'
+rescue Gem::LoadError
+ require 'action_controller/vendor/rack-1.0/rack'
+end
module ActionController
# TODO: Review explicit to see if they will automatically be handled by

0 comments on commit 0a887e2

Please sign in to comment.