aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/lib/dispatcher.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index 0fcd295094..e539ab5af8 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -43,8 +43,8 @@ class Dispatcher
if ActionController::Base.reload_dependencies
Object.send(:remove_const, "ApplicationController") if Object.const_defined?(:ApplicationController)
Object.send(:remove_const, controller_class_name(controller_name)) if Object.const_defined?(controller_class_name(controller_name))
- ActiveRecord::Base.reload_associations_loaded
ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses
+ ActiveRecord::Base.reload_associations_loaded
end
Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT)