From 2277fbedbea930fb8ce38ab7eb133de6fcc4a2d6 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sat, 7 Feb 2009 00:08:28 -0600 Subject: Temporarily bundle Rack 1.0 prerelease for testing --- actionpack/lib/action_controller.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'actionpack/lib/action_controller.rb') diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 3e77970367..5f76dbaabb 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -31,9 +31,8 @@ rescue LoadError end end -gem 'rack', '>= 0.9.0' +$:.unshift "#{File.dirname(__FILE__)}/action_controller/vendor/rack-1.0" require 'rack' -require 'action_controller/rack_ext' module ActionController # TODO: Review explicit to see if they will automatically be handled by @@ -77,7 +76,6 @@ module ActionController autoload :UploadedFile, 'action_controller/uploaded_file' autoload :UploadedStringIO, 'action_controller/uploaded_file' autoload :UploadedTempfile, 'action_controller/uploaded_file' - autoload :UrlEncodedPairParser, 'action_controller/url_encoded_pair_parser' autoload :UrlRewriter, 'action_controller/url_rewriter' autoload :UrlWriter, 'action_controller/url_rewriter' autoload :Verification, 'action_controller/verification' -- cgit v1.2.3