diff options
Diffstat (limited to 'actionpack/lib/action_dispatch.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb index 884828a01a..849f268a8c 100644 --- a/actionpack/lib/action_dispatch.rb +++ b/actionpack/lib/action_dispatch.rb @@ -25,15 +25,11 @@ activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" $:.unshift activesupport_path if File.directory?(activesupport_path) require 'active_support' -begin - gem 'rack', '~> 1.1.pre' -rescue Gem::LoadError, ArgumentError - $:.unshift "#{File.dirname(__FILE__)}/action_dispatch/vendor/rack-1.1.pre" -end - require 'rack' -$:.unshift "#{File.dirname(__FILE__)}/action_dispatch/vendor/rack-test" +module Rack + autoload :Test, 'rack/test' +end module ActionDispatch autoload :Request, 'action_dispatch/http/request' |