diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-05 10:14:28 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-05 10:14:28 -0300 |
| commit | a83a1ccebaaae5e05741ebd5d9db408c450df098 (patch) | |
| tree | 79dc5924ce11481674180e1d216ec6551e634011 /railties | |
| parent | d19d4d2f20d87289eaeaa8df807d635ce72f3799 (diff) | |
| parent | d4402c5554a0d3202fc22eb38c5c1a8c4b9afd93 (diff) | |
| download | rails-a83a1ccebaaae5e05741ebd5d9db408c450df098.tar.gz rails-a83a1ccebaaae5e05741ebd5d9db408c450df098.tar.bz2 rails-a83a1ccebaaae5e05741ebd5d9db408c450df098.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/console_app.rb | 5 | ||||
| -rw-r--r-- | railties/lib/rails/rack/metal.rb | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/railties/lib/console_app.rb b/railties/lib/console_app.rb index 5c8302634a..c944d49205 100644 --- a/railties/lib/console_app.rb +++ b/railties/lib/console_app.rb @@ -26,7 +26,8 @@ end #reloads the environment def reload! puts "Reloading..." - Dispatcher.cleanup_application - Dispatcher.reload_application + dispatcher = ActionController::Dispatcher.new + dispatcher.cleanup_application + dispatcher.reload_application true end diff --git a/railties/lib/rails/rack/metal.rb b/railties/lib/rails/rack/metal.rb index 7a616c7911..b031be29af 100644 --- a/railties/lib/rails/rack/metal.rb +++ b/railties/lib/rails/rack/metal.rb @@ -1,5 +1,6 @@ require 'active_support/ordered_hash' require 'active_support/core_ext/class/attribute_accessors' +require 'active_support/dependencies' module Rails module Rack @@ -27,7 +28,7 @@ module Rails load_list.map do |requested_metal| if metal = all_metals[requested_metal] - require metal + require_dependency metal requested_metal.constantize end end.compact |