diff options
| author | José Valim <jose.valim@gmail.com> | 2012-05-10 01:03:03 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-05-10 01:03:03 -0700 |
| commit | ffa1c72d1d238b4c1b73aeb6a387d0f331a97f2c (patch) | |
| tree | 5955e7acb2c607957f5d25880b79c11392fbb8c9 | |
| parent | a45a5d88e4d7425e9fed7bae78fb3e1a3c6221e4 (diff) | |
| parent | e471aacf60f36a6f3074eebe32216b8c55c02434 (diff) | |
| download | rails-ffa1c72d1d238b4c1b73aeb6a387d0f331a97f2c.tar.gz rails-ffa1c72d1d238b4c1b73aeb6a387d0f331a97f2c.tar.bz2 rails-ffa1c72d1d238b4c1b73aeb6a387d0f331a97f2c.zip | |
Merge pull request #6242 from frodsan/fix_abstract_controller
Removing key argument from run_callbacks method in abstract_controller
| -rw-r--r-- | actionpack/lib/abstract_controller/callbacks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb index 520c210721..5705ab590c 100644 --- a/actionpack/lib/abstract_controller/callbacks.rb +++ b/actionpack/lib/abstract_controller/callbacks.rb @@ -14,7 +14,7 @@ module AbstractController # Override AbstractController::Base's process_action to run the # process_action callbacks around the normal behavior. def process_action(*args) - run_callbacks(:process_action, action_name) do + run_callbacks(:process_action) do super end end |