diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 12:46:48 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 12:46:48 +0000 |
| commit | 76168e23fd78d276a197cc992bb6ef5a065f6f3f (patch) | |
| tree | f15093086b2ff767968e6bbd1b816c66f35bd5dd /config/routes.rb | |
| parent | fb2b20037bb176533de4e7fa86701248473f8ee3 (diff) | |
| parent | 589d9b8c1e14bb7086a6b7baf0fa7e3b9aaeabf0 (diff) | |
Merge branch 'develop' into xapian-dcabo
Conflicts:
spec/models/xapian_spec.rb
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 2 |
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' |