diff --git a/CHANGELOG b/CHANGELOG index 0e0729de..855ee305 100755 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,5 @@ * trunk: + Upgraded to Rails 0.13.1 Fixed HTML export Added layout=no option to the export_html action (it exports page contents processed by the markup engine, but without the default layout - so that they can be wrapper in diff --git a/config/routes.rb b/config/routes.rb index 2dd4b5c5..1daeb0d1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ -ActionController::Routing.draw do |map| +ActionController::Routing::Routes.draw do |map| map.connect 'create_system', :controller => 'admin', :action => 'create_system' map.connect 'create_web', :controller => 'admin', :action => 'create_web' map.connect ':web/edit_web', :controller => 'admin', :action => 'edit_web'