aboutsummaryrefslogtreecommitdiffstats
path: root/config/routes.rb
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2011-11-24 10:35:49 +0000
committerSeb Bacon <seb.bacon@gmail.com>2011-11-24 10:35:49 +0000
commit8494003ebf71ef437dfccb9374366a51ecb5924c (patch)
tree88f105ebb3ebdd84b64b4b5cb5f00db5cacd9e2d /config/routes.rb
parentfbfebdbe1c5b13f86f92404c3397d6dcb75766ce (diff)
parentb7075181100852ff2117d61b02881e84deaafa87 (diff)
Merge remote-tracking branch 'jpmckinney/pre1.9' into develop
Conflicts: spec/controllers/request_controller_spec.rb
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 48bf92e75..511b5fc1e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -15,7 +15,7 @@ ActionController::Routing::Routes.draw do |map|
# Keep in mind you can assign values other than :controller and :action
# Allow easy extension from themes. Note these will have the highest priority.
- require 'config/custom-routes'
+ require File.join(Rails.root, 'config', 'custom-routes')
map.with_options :controller => 'general' do |general|
general.frontpage '/', :action => 'frontpage'