diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-04-14 15:52:23 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-04-14 15:52:23 -0500 |
commit | 4839fe2e8201835a53ab6c75528a613e8bf25bfb (patch) | |
tree | 55f5c3f76358fcbb28fca6ac9bcd915cbefac89a /actionpack/lib/action_controller.rb | |
parent | 1120aaceae95b95ef491ca226154500051b5fe38 (diff) | |
download | rails-4839fe2e8201835a53ab6c75528a613e8bf25bfb.tar.gz rails-4839fe2e8201835a53ab6c75528a613e8bf25bfb.tar.bz2 rails-4839fe2e8201835a53ab6c75528a613e8bf25bfb.zip |
Move bundled rack into ActionDispatch
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rw-r--r-- | actionpack/lib/action_controller.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index e435bdbae1..1c01aaa277 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -32,13 +32,6 @@ rescue LoadError end require File.join(File.dirname(__FILE__), "action_pack") -$:.unshift "#{File.dirname(__FILE__)}/action_controller/vendor/rack-1.0" -begin - gem 'rack', '~> 1.0.0' - require 'rack' -rescue Gem::LoadError - require 'action_controller/vendor/rack-1.0/rack' -end module ActionController # TODO: Review explicit to see if they will automatically be handled by |