Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

2009-09-05 02:45:51 -05:00 · 2009-09-05 02:45:51 -05:00 · 63deb51ec1
parent 9be02c92e5 37a8f30ded
commit 63deb51ec1
1 changed files with 6 additions and 2 deletions
--- a/vendor/rails/actionpack/lib/action_controller.rb
+++ b/vendor/rails/actionpack/lib/action_controller.rb
@ -31,8 +31,12 @@ rescue LoadError
  end
 end

-gem 'rack', '~> 1.0.0'
-require 'rack'
+begin
+  gem 'rack', '~> 1.1.0'
+  require 'rack'
+rescue Gem::LoadError
+  require 'action_controller/vendor/rack-1.1.pre/rack'
+end

 module ActionController
  # TODO: Review explicit to see if they will automatically be handled by