aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-05-29 21:44:35 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-05-29 21:44:35 +0000
commit3cf2c63eee8c8de57b4856c13008979fee2778bf (patch)
tree9da44bfbef63ac0f4d273a973b9cfed9b1146945 /railties
parentaf98d883b91aad78cd8183f8abbdf27bd740ff66 (diff)
downloadrails-3cf2c63eee8c8de57b4856c13008979fee2778bf.tar.gz
rails-3cf2c63eee8c8de57b4856c13008979fee2778bf.tar.bz2
rails-3cf2c63eee8c8de57b4856c13008979fee2778bf.zip
Console reload! runs to_prepare callbacks also. Closes #8393.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6897 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-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