aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-11-25 13:20:12 -0600
committerJoshua Peek <josh@joshpeek.com>2008-11-25 13:20:12 -0600
commit3dd3ffde06931d47e3052260efba26b1cc5bd7c9 (patch)
treefb9b6c0936428702febfc87ea959d71a142b76a4 /actionpack/lib/action_controller.rb
parentd4754677a34d34d4a0955a04f2cc6571bdc5e82d (diff)
downloadrails-3dd3ffde06931d47e3052260efba26b1cc5bd7c9.tar.gz
rails-3dd3ffde06931d47e3052260efba26b1cc5bd7c9.tar.bz2
rails-3dd3ffde06931d47e3052260efba26b1cc5bd7c9.zip
Depend on rack 0.4.0 instead of vendoring it
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rw-r--r--actionpack/lib/action_controller.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index a7a7d932c4..da5f1e81e6 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -31,6 +31,9 @@ rescue LoadError
end
end
+gem 'rack', '~> 0.4.0'
+require 'rack'
+
module ActionController
# TODO: Review explicit to see if they will automatically be handled by
# the initilizer if they are really needed.
@@ -99,6 +102,5 @@ end
autoload :Mime, 'action_controller/mime_type'
autoload :HTML, 'action_controller/vendor/html-scanner'
-autoload :Rack, 'action_controller/vendor/rack'
require 'action_view'