aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-17 02:04:37 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-17 02:04:37 +0000
commit6a48e89ae7811904822eb203ad9f54897e460f07 (patch)
tree44a480f138ad71d5f93b7ffe5074d4d09e8ae45d /actionpack/lib
parentead404ccd0f8e384409835ec4c5b770c06c1e178 (diff)
downloadrails-6a48e89ae7811904822eb203ad9f54897e460f07.tar.gz
rails-6a48e89ae7811904822eb203ad9f54897e460f07.tar.bz2
rails-6a48e89ae7811904822eb203ad9f54897e460f07.zip
Fix that routes werent being loaded in production environment
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@642 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/routing.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index 7ea8f5be5e..6c3b73843c 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -237,7 +237,8 @@ module ActionController
alias :connect :route
def reload
- begin require_dependency(ROUTE_FILE)
+ begin
+ require_dependency(ROUTE_FILE) if Object.method_defined?(:require_dependency)
rescue LoadError, ScriptError => e
raise RoutingError, "Cannot load config/routes.rb:\n #{e.message}"
ensure # Ensure that there is at least one route: