aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorYehuda Katz <wycats@Yehuda-Katz.local>2009-11-05 15:38:04 -0800
committerYehuda Katz <wycats@Yehuda-Katz.local>2009-11-05 15:38:25 -0800
commitb12f194c396b5d279986dd16a3b2caa360e64d19 (patch)
treee93dc34627404a3b69ff4b223e128884941f7d0a /actionpack/lib/action_controller/metal
parentb0dfd1d19b83f1812317345a68c6bc1ad590be53 (diff)
downloadrails-b12f194c396b5d279986dd16a3b2caa360e64d19.tar.gz
rails-b12f194c396b5d279986dd16a3b2caa360e64d19.tar.bz2
rails-b12f194c396b5d279986dd16a3b2caa360e64d19.zip
Update AC::Middleware to play better with the normal AC::Metal stack. This required stopping to use #call for non-rack-related stuff
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/rack_convenience.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/rack_convenience.rb b/actionpack/lib/action_controller/metal/rack_convenience.rb
index a80569c530..131d20114d 100644
--- a/actionpack/lib/action_controller/metal/rack_convenience.rb
+++ b/actionpack/lib/action_controller/metal/rack_convenience.rb
@@ -8,7 +8,7 @@ module ActionController
attr_internal :request
end
- def call(name, env)
+ def dispatch(action, env)
@_request = ActionDispatch::Request.new(env)
@_response = ActionDispatch::Response.new
@_response.request = request