From 6e57b88c60fa3ad1ecfa740b8cd3173c4fe72680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sun, 24 Jan 2010 21:21:37 +0100 Subject: Fix a couple failures on 1.9.1. --- railties/lib/rails/application/finisher.rb | 2 +- railties/lib/rails/console/app.rb | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'railties') diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index 6461b76d3d..5cc5b4ae88 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -17,7 +17,7 @@ module Rails initializer :add_builtin_route do |app| if Rails.env.development? - RoutesReloader.paths << File.join(RAILTIES_PATH, 'builtin', 'routes.rb') + Rails::Application::RoutesReloader.paths << File.join(RAILTIES_PATH, 'builtin', 'routes.rb') end end diff --git a/railties/lib/rails/console/app.rb b/railties/lib/rails/console/app.rb index 98f7f774a9..7e8fd027e6 100644 --- a/railties/lib/rails/console/app.rb +++ b/railties/lib/rails/console/app.rb @@ -23,9 +23,11 @@ def new_session session end -#reloads the environment -def reload! - puts "Reloading..." - ActionDispatch::Callbacks.new(lambda {}, true).call({}) +# reloads the environment +def reload!(print=true) + puts "Reloading..." if print + ActionDispatch::Callbacks.new(lambda {}, false) true end + +reload!(false) -- cgit v1.2.3