aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cabo <david@calibea.com>2012-02-05 23:53:54 +0100
committerDavid Cabo <david@calibea.com>2012-02-05 23:53:54 +0100
commitb1a683778e817005751ac08654d17366d4cda624 (patch)
treed7e709057827fb6378a85ae2e97bf3131355a58c
parentbfa6947ea371990d8b8bbb39f486be8d351c5c0e (diff)
parent84d601ae9fb50e595acaf9c5b0027a2b9bb71a66 (diff)
Merge branch 'release/0.5' of github.com:sebbacon/alaveteli
-rw-r--r--config/routes.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index c4339209a..fa387a106 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 File.join(Rails.root, 'config', 'custom-routes')
+ require File.join('config', 'custom-routes')
map.with_options :controller => 'general' do |general|
general.frontpage '/', :action => 'frontpage'