Merge remote branch 'rails/master'

Conflicts:
	actionpack/lib/abstract_controller/base.rb

2 files changed, 2 insertions, 46 deletions

diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index 0a435f0f36..44e26b5713 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -1,4 +1,5 @@
 require "active_support/notifications"
+require "active_support/descendants_tracker"
 
 module Rails
   class Application
@@ -55,6 +56,7 @@ module Rails
       initializer :set_clear_dependencies_hook do
         unless config.cache_classes
           ActionDispatch::Callbacks.after do
+            ActiveSupport::DescendantsTracker.clear
             ActiveSupport::Dependencies.clear
           end
         end
diff --git a/railties/lib/rails/application/routes_reloader.rb b/railties/lib/rails/application/routes_reloader.rb
deleted file mode 100644
index a2b3622df8..0000000000
--- a/railties/lib/rails/application/routes_reloader.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-module Rails
-  class Application
-    class RoutesReloader
-      attr_reader :paths
-
-      def initialize
-        @paths, @last_change_at = [], nil
-      end
-
-      def changed_at
-        routes_changed_at = nil
-
-        paths.each do |path|
-          config_changed_at = File.stat(path).mtime
-
-          if routes_changed_at.nil? || config_changed_at > routes_changed_at
-            routes_changed_at = config_changed_at
-          end
-        end
-
-        routes_changed_at
-      end
-
-      def reload!
-        routes = Rails::Application.routes
-        routes.disable_clear_and_finalize = true
-
-        routes.clear!
-        paths.each { |path| load(path) }
-        ActiveSupport.on_load(:action_controller) { routes.finalize! }
-
-        nil
-      ensure
-        routes.disable_clear_and_finalize = false
-      end
-
-      def reload_if_changed
-        current_change_at = changed_at
-        if @last_change_at != current_change_at
-          @last_change_at = current_change_at
-          reload!
-        end
-      end
-    end
-  end
-end
\ No newline at end of file