aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-14 19:53:07 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-15 12:24:30 +0100
commit8c8942ed4f2da52aa42ccd46560acb0b5fd37cb8 (patch)
tree976072122a45b4d050a0d6e798ae55ac3fea67a7 /actionpack/lib/action_controller/metal
parent5a8e7287c542cbe82d3127cae83dab8571ab9114 (diff)
downloadrails-8c8942ed4f2da52aa42ccd46560acb0b5fd37cb8.tar.gz
rails-8c8942ed4f2da52aa42ccd46560acb0b5fd37cb8.tar.bz2
rails-8c8942ed4f2da52aa42ccd46560acb0b5fd37cb8.zip
Move Dispatcher setup to Railties and add instrumentation hook.
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/instrumentation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb
index e0c75c9e44..4549f6c451 100644
--- a/actionpack/lib/action_controller/metal/instrumentation.rb
+++ b/actionpack/lib/action_controller/metal/instrumentation.rb
@@ -66,7 +66,7 @@ module ActionController
module ClassMethods
# A hook which allows other frameworks to log what happened during
- # controller process action. This method should return an awway
+ # controller process action. This method should return an array
# with the messages to be added.
# :api: plugin
def log_process_action(controller) #:nodoc: