aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/console_app.rb4
2 files changed, 5 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index baf0a0ef09..58e8e60d19 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Console reload! runs to_prepare callbacks also. #8393 [f.svehla]
+
* Generated migrations include timestamps by default. #8501 [Shane Vitarana]
* Drop Action Web Service from rails:freeze:edge. [Jeremy Kemper]
diff --git a/railties/lib/console_app.rb b/railties/lib/console_app.rb
index 4c2126057a..b23cda9da0 100644
--- a/railties/lib/console_app.rb
+++ b/railties/lib/console_app.rb
@@ -23,5 +23,7 @@ end
#reloads the environment
def reload!
puts "Reloading..."
- Dispatcher.reset_application!
+ returning Dispatcher.reset_application! do
+ Dispatcher.send :run_preparation_callbacks
+ end
end