aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Connor <timocratic@gmail.com>2009-05-04 20:11:24 -0500
committerJoshua Peek <josh@joshpeek.com>2009-05-04 20:11:24 -0500
commite3891601d137a400722cfd0f941b9195b0a8217b (patch)
tree559b60dda8cbdac87d0d47d05ac14d61192e3618
parentb9f9dd8fe9d84c22450c1cf24b6c8a41eae8bbfd (diff)
downloadrails-e3891601d137a400722cfd0f941b9195b0a8217b.tar.gz
rails-e3891601d137a400722cfd0f941b9195b0a8217b.tar.bz2
rails-e3891601d137a400722cfd0f941b9195b0a8217b.zip
fix problems with requires in metal choking under development reloading [#2579 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
-rw-r--r--railties/lib/rails/rack/metal.rb3
1 files changed, 2 insertions, 1 deletions
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