deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Jacques Distler 2009-09-05 02:45:51 -05:00
parent 9be02c92e5 37a8f30ded
commit 63deb51ec1
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vendor/rails/actionpack/lib/action_controller.rb vendored
View file

@ -31,8 +31,12 @@ rescue LoadError
end end
end end
gem 'rack', '~> 1.0.0' begin
gem 'rack', '~> 1.1.0'
require 'rack' require 'rack'
rescue Gem::LoadError
require 'action_controller/vendor/rack-1.1.pre/rack'
end
module ActionController module ActionController
# TODO: Review explicit to see if they will automatically be handled by # TODO: Review explicit to see if they will automatically be handled by