diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-21 11:28:16 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-21 11:28:16 -0800 |
| commit | fa8849a573aa98750fc5fdacf557d973b85072ca (patch) | |
| tree | 0c343cdc94eb861413b3f70b1ecf329468dce684 /actionpack/test/abstract/abstract_controller_test.rb | |
| parent | c06aff0a7e42868e9788d6cefe5ce49e93cbf45b (diff) | |
| parent | f09ad263cabe2e781c1994b85375fee8deba4317 (diff) | |
| download | rails-fa8849a573aa98750fc5fdacf557d973b85072ca.tar.gz rails-fa8849a573aa98750fc5fdacf557d973b85072ca.tar.bz2 rails-fa8849a573aa98750fc5fdacf557d973b85072ca.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/test/abstract/abstract_controller_test.rb')
| -rw-r--r-- | actionpack/test/abstract/abstract_controller_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb index 524381509d..4ad87d9762 100644 --- a/actionpack/test/abstract/abstract_controller_test.rb +++ b/actionpack/test/abstract/abstract_controller_test.rb @@ -28,7 +28,7 @@ module AbstractController # Test Render mixin # ==== class RenderingController < AbstractController::Base - include ::AbstractController::RenderingController + include ::AbstractController::Rendering def _prefix() end |