Skip to content
This repository
Browse code

check for rack 1.0 gem before falling back to bundled version

  • Loading branch information...
commit 0a887e2386a827f554c685dccf91701bb38422b5 1 parent 572e0aa
Joshua Peek authored March 10, 2009

Showing 1 changed file with 6 additions and 1 deletion. Show diff stats Hide diff stats

  1. 7  actionpack/lib/action_controller.rb
7  actionpack/lib/action_controller.rb
@@ -31,7 +31,12 @@
31 31
   end
32 32
 end
33 33
 
34  
-require 'action_controller/vendor/rack-1.0/rack'
  34
+begin
  35
+  gem 'rack', '~> 1.0.0'
  36
+  require 'rack'
  37
+rescue Gem::LoadError
  38
+  require 'action_controller/vendor/rack-1.0/rack'
  39
+end
35 40
 
36 41
 module ActionController
37 42
   # TODO: Review explicit to see if they will automatically be handled by

0 notes on commit 0a887e2

Please sign in to comment.
Something went wrong with that request. Please try again.