aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2009-02-22 16:04:04 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2009-02-22 16:04:04 +0100
commitb61cad6ae140bc71c6a74b22c75e886b41154b0a (patch)
tree3486d11661ca3bd9e543267089d1cc002d544b68
parent57cca81caea7a6ffccc6f6a4df411f05845b622e (diff)
downloadrails-b61cad6ae140bc71c6a74b22c75e886b41154b0a.tar.gz
rails-b61cad6ae140bc71c6a74b22c75e886b41154b0a.tar.bz2
rails-b61cad6ae140bc71c6a74b22c75e886b41154b0a.zip
Ensure that the app routes file is loaded even when engines are in play (Thjis) [#1970 state:committed]
-rw-r--r--railties/lib/initializer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 8221f1f2f2..eb8d3510c8 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -496,7 +496,7 @@ Run `rake gems:install` to install the missing gems.
ActionController::Routing.controller_paths += configuration.controller_paths
ActionController::Routing::Routes.add_configuration_file(configuration.routes_configuration_file)
- ActionController::Routing::Routes.reload
+ ActionController::Routing::Routes.reload!
end
# Sets the dependency loading mechanism based on the value of