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

Unvendor Rack

Browse source 
You'll need to rerun

   ruby bundle

as rack is now loaded as gem.
This commit is contained in:
Jacques Distler 2011-06-01 12:26:50 -05:00
parent 7290e90631
commit 7e5dbe5854
137 changed files with 10 additions and 12960 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,13 +31,8 @@ rescue LoadError
end
end
begin
gem 'rack', '~> 1.1.0'
require 'rack'
rescue Gem::LoadError
$:.unshift "#{File.dirname(__FILE__)}/../../../plugins/rack/lib"
require 'rack'
end
gem 'rack', '>= 1.1.0'
require 'rack'
require 'action_controller/cgi_ext'
module ActionController