aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-09-08 15:39:33 -0300
committerEmilio Tagua <miloops@gmail.com>2009-09-08 15:39:33 -0300
commit0489f0c582d2ab70595296f058545b102466bebd (patch)
tree159a85dda7bdb652c93cc05a7ab422283c9f3035 /actionpack
parent670281c6b2e9b9e8c51a140f2a5f66b251f1b84b (diff)
parentaf5b12c64c878f08336d38e91cc64137a30fb8da (diff)
downloadrails-0489f0c582d2ab70595296f058545b102466bebd.tar.gz
rails-0489f0c582d2ab70595296f058545b102466bebd.tar.bz2
rails-0489f0c582d2ab70595296f058545b102466bebd.zip
Merge commit 'rails/master'
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/abstract_controller/callbacks.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb
index ea4b59466e..379eaf6d8e 100644
--- a/actionpack/lib/abstract_controller/callbacks.rb
+++ b/actionpack/lib/abstract_controller/callbacks.rb
@@ -10,7 +10,7 @@ module AbstractController
include ActiveSupport::NewCallbacks
included do
- define_callbacks :process_action, "response_body"
+ define_callbacks :process_action, :terminator => "response_body"
end
# Override AbstractController::Base's process_action to run the