Permalink
Browse files

Fix a couple failures on 1.9.1.

  • Loading branch information...
josevalim committed Jan 24, 2010
1 parent 9543298 commit 6e57b88c60fa3ad1ecfa740b8cd3173c4fe72680
Showing with 7 additions and 5 deletions.
  1. +1 −1 railties/lib/rails/application/finisher.rb
  2. +6 −4 railties/lib/rails/console/app.rb
@@ -17,7 +17,7 @@ module Finisher
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
@@ -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)

0 comments on commit 6e57b88

Please sign in to comment.