aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rw-r--r--actionpack/lib/action_controller.rb7
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