Merge branch 'master' of http://github.com/rails/rails

1 files changed, 1 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index a32fb7d399..2808e199fe 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -9,6 +9,7 @@ require "active_model/railtie"
 require "action_controller/railtie"
 
 module ActiveRecord
+  # = Active Record Railtie
   class Railtie < Rails::Railtie
     config.active_record = ActiveSupport::OrderedOptions.new
 
@@ -25,9 +26,6 @@ module ActiveRecord
       load "active_record/railties/databases.rake"
     end
 
-    require "active_record/railties/log_subscriber"
-    log_subscriber :active_record, ActiveRecord::Railties::LogSubscriber.new
-
     initializer "active_record.initialize_timezone" do
       ActiveSupport.on_load(:active_record) do
         self.time_zone_aware_attributes = true
@@ -68,7 +66,6 @@ module ActiveRecord
       unless app.config.cache_classes
         ActiveSupport.on_load(:active_record) do
           ActionDispatch::Callbacks.after do
-            ActiveRecord::Base.reset_subclasses
             ActiveRecord::Base.clear_reloadable_connections!
           end
         end