aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-12-22 17:11:21 -0600
committerJoshua Peek <josh@joshpeek.com>2009-12-22 17:11:21 -0600
commitb1aee9f4eebdae4fad38572359649c097c731b77 (patch)
treeff23a026a458a0abbca7e700439cd4cdbf781585 /actionpack/lib/action_dispatch.rb
parent2d0c703c922758dc36df8a20a56894484013b0f1 (diff)
downloadrails-b1aee9f4eebdae4fad38572359649c097c731b77.tar.gz
rails-b1aee9f4eebdae4fad38572359649c097c731b77.tar.bz2
rails-b1aee9f4eebdae4fad38572359649c097c731b77.zip
All AD modules are "deferrable"
Diffstat (limited to 'actionpack/lib/action_dispatch.rb')
-rw-r--r--actionpack/lib/action_dispatch.rb12
1 files changed, 5 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index ed04980ab0..4e04e2a17c 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -34,12 +34,12 @@ end
module ActionDispatch
extend ActiveSupport::Autoload
- autoload_under 'http' do
- autoload :Request
- autoload :Response
- end
-
deferrable do
+ autoload_under 'http' do
+ autoload :Request
+ autoload :Response
+ end
+
autoload_under 'middleware' do
autoload :Callbacks
autoload :ParamsParser
@@ -71,8 +71,6 @@ module ActionDispatch
autoload :TestResponse
end
end
-
- autoload :HTML, 'action_controller/vendor/html-scanner'
end
autoload :Mime, 'action_dispatch/http/mime_type'