diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-02-07 00:08:28 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-02-07 00:08:28 -0600 |
| commit | 2277fbedbea930fb8ce38ab7eb133de6fcc4a2d6 (patch) | |
| tree | 784f2dfcd066eaa17a89cc435ec4de44393799c8 /actionpack/lib/action_controller.rb | |
| parent | 24f2e676f700b8a387c6f4c27acf172658cd7863 (diff) | |
| download | rails-2277fbedbea930fb8ce38ab7eb133de6fcc4a2d6.tar.gz rails-2277fbedbea930fb8ce38ab7eb133de6fcc4a2d6.tar.bz2 rails-2277fbedbea930fb8ce38ab7eb133de6fcc4a2d6.zip | |
Temporarily bundle Rack 1.0 prerelease for testing
Diffstat (limited to 'actionpack/lib/action_controller.rb')
| -rw-r--r-- | actionpack/lib/action_controller.rb | 4 |
1 files changed, 1 insertions, 3 deletions
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' |