diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-04-25 13:56:37 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-04-25 13:56:37 -0500 |
| commit | b69da86ea545b342036fb37a472ec5abefaf3bd5 (patch) | |
| tree | 91590afc783500eb48700fe93f1cc66bf493fcf2 /actionpack/lib/action_dispatch.rb | |
| parent | 044794fc9e1235981d20172b96f3b34b044ad19c (diff) | |
| download | rails-b69da86ea545b342036fb37a472ec5abefaf3bd5.tar.gz rails-b69da86ea545b342036fb37a472ec5abefaf3bd5.tar.bz2 rails-b69da86ea545b342036fb37a472ec5abefaf3bd5.zip | |
Remove vendored version of Rack
Diffstat (limited to 'actionpack/lib/action_dispatch.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb index 13ce38e928..0c915d9fd5 100644 --- a/actionpack/lib/action_dispatch.rb +++ b/actionpack/lib/action_dispatch.rb @@ -32,13 +32,8 @@ rescue LoadError end require 'active_support/core/all' -$:.unshift "#{File.dirname(__FILE__)}/action_dispatch/vendor/rack-1.0" -begin - gem 'rack', '~> 1.0.0' - require 'rack' -rescue Gem::LoadError - require 'action_dispatch/vendor/rack-1.0/rack' -end +gem 'rack', '~> 1.0.0' +require 'rack' module ActionDispatch autoload :Request, 'action_dispatch/http/request' |