diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-09 13:07:30 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-09 13:07:30 -0300 |
| commit | 6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5 (patch) | |
| tree | c169325ddd18aedd18c66f22a53ba04190a0a41e /actionpack/test/abstract_controller/callbacks_test.rb | |
| parent | 8885b2d6c1855742600d0afdb9dfc002acb62e5e (diff) | |
| parent | 8ee0c598dbe3f9fd133e85c69c6e43f62056646c (diff) | |
| download | rails-6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5.tar.gz rails-6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5.tar.bz2 rails-6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test/abstract_controller/callbacks_test.rb')
| -rw-r--r-- | actionpack/test/abstract_controller/callbacks_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/abstract_controller/callbacks_test.rb b/actionpack/test/abstract_controller/callbacks_test.rb index 5fce30f478..89243b631e 100644 --- a/actionpack/test/abstract_controller/callbacks_test.rb +++ b/actionpack/test/abstract_controller/callbacks_test.rb @@ -4,7 +4,7 @@ module AbstractController module Testing class ControllerWithCallbacks < AbstractController::Base - use AbstractController::Callbacks + include AbstractController::Callbacks end class Callback1 < ControllerWithCallbacks |