diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-08-17 21:49:16 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-08-17 21:49:16 +0530 |
| commit | 9abe72c7600132aa964ca48c312ef981007ab8b1 (patch) | |
| tree | 6062ada5e442186cf949df4b9a1502e84bbb0271 /actionpack/test/controller/new_base/render_streaming_test.rb | |
| parent | d73232c9c8933b9f3092d5d27b7ffab6ccc0422c (diff) | |
| parent | ec8ef1e1055c4e1598da13f49d30261f07f4a9b4 (diff) | |
| download | rails-9abe72c7600132aa964ca48c312ef981007ab8b1.tar.gz rails-9abe72c7600132aa964ca48c312ef981007ab8b1.tar.bz2 rails-9abe72c7600132aa964ca48c312ef981007ab8b1.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
actionview/README.rdoc
activerecord/lib/active_record/migration.rb
guides/source/development_dependencies_install.md
guides/source/getting_started.md
Diffstat (limited to 'actionpack/test/controller/new_base/render_streaming_test.rb')
| -rw-r--r-- | actionpack/test/controller/new_base/render_streaming_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb index 2b36a399bb..f4bdd3e1d4 100644 --- a/actionpack/test/controller/new_base/render_streaming_test.rb +++ b/actionpack/test/controller/new_base/render_streaming_test.rb @@ -92,7 +92,7 @@ module RenderStreaming io.rewind assert_match "(undefined method `invalid!' for nil:NilClass)", io.read ensure - ActionView::Base.logger = _old + ActionController::Base.logger = _old end end |