Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

check for rack 1.0 gem before falling back to bundled version

  • Loading branch information...
commit 0a887e2386a827f554c685dccf91701bb38422b5 1 parent 572e0aa
@josh josh authored
Showing with 6 additions and 1 deletion.
  1. +6 −1 actionpack/lib/action_controller.rb
View
7 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
Please sign in to comment.
Something went wrong with that request. Please try again.