From be098f840614bbb71fe26f0e2b4c064b6866c076 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Thu, 5 Feb 2009 20:39:52 -0600 Subject: Cleanup application has been merged with reload --- railties/lib/console_app.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'railties/lib/console_app.rb') diff --git a/railties/lib/console_app.rb b/railties/lib/console_app.rb index 96bf3117c8..a35c96c957 100644 --- a/railties/lib/console_app.rb +++ b/railties/lib/console_app.rb @@ -25,7 +25,6 @@ end def reload! puts "Reloading..." dispatcher = ActionController::Dispatcher.new($stdout) - dispatcher.cleanup_application dispatcher.reload_application true end -- cgit v1.2.3 From 69c049f5ab45bf9bfb0d269acea0773581905fd4 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Fri, 20 Feb 2009 12:04:57 -0600 Subject: Move development mode reloading up the stack to avoid issues with class reloading in middleware --- railties/lib/console_app.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'railties/lib/console_app.rb') diff --git a/railties/lib/console_app.rb b/railties/lib/console_app.rb index a35c96c957..d7cd57564f 100644 --- a/railties/lib/console_app.rb +++ b/railties/lib/console_app.rb @@ -24,7 +24,6 @@ end #reloads the environment def reload! puts "Reloading..." - dispatcher = ActionController::Dispatcher.new($stdout) - dispatcher.reload_application + Dispatcher.reload_application true end -- cgit v1.2.3 From d32eb410f19f6872df1e1e1810840c0f5aa13b50 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 24 Feb 2009 10:52:51 -0600 Subject: Put back dispatcher cleanup call in console reload! [#2056 state:resolved] --- railties/lib/console_app.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'railties/lib/console_app.rb') diff --git a/railties/lib/console_app.rb b/railties/lib/console_app.rb index d7cd57564f..d7d01d703f 100644 --- a/railties/lib/console_app.rb +++ b/railties/lib/console_app.rb @@ -24,6 +24,7 @@ end #reloads the environment def reload! puts "Reloading..." + Dispatcher.cleanup_application Dispatcher.reload_application true end -- cgit v1.2.3