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

3 files changed, 1 insertions, 6 deletions

diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 2d89969fd3..a9c62899b5 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -646,7 +646,6 @@ class RespondWithControllerTest < ActionController::TestCase
     Mime::Type.register_alias('text/html', :iphone)
     Mime::Type.register_alias('text/html', :touch)
     Mime::Type.register('text/x-mobile', :mobile)
-    Customer.send(:undef_method, :to_json) if Customer.method_defined?(:to_json)
   end
 
   def teardown
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
 
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 98b34a872b..fd835795c0 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -775,10 +775,6 @@ class RenderTest < ActionController::TestCase
     @request.host = "www.nextangle.com"
   end
 
-  def teardown
-    ActionView::Base.logger = nil
-  end
-
   # :ported:
   def test_simple_show
     get :hello_world