route: move news after project scope

On Rails 3.0, news test passes.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8546 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/routes.rb b/config/routes.rb
index ae5f0f8a780dd1379a71b6f74778772e4503609c..54c5b1d1f64f86dfd58201fd1327b16f6756ebaf 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -121,8 +121,6 @@ ActionController::Routing::Routes.draw do |map|
   # For nice "roadmap" in the url for the index action
   map.connect 'projects/:project_id/roadmap', :controller => 'versions', :action => 'index'
 
-  map.connect 'news', :controller => 'news', :action => 'index'
-  map.connect 'news.:format', :controller => 'news', :action => 'index'
   map.preview_news '/news/preview', :controller => 'previews', :action => 'news'
   map.connect 'news/:id/comments', :controller => 'comments',
               :action => 'create', :conditions => {:method => :post}
@@ -193,6 +191,9 @@ ActionController::Routing::Routes.draw do |map|
     }
   end
 
+  map.connect 'news', :controller => 'news', :action => 'index'
+  map.connect 'news.:format', :controller => 'news', :action => 'index'
+
   map.resources :queries, :except => [:show]
   map.resources :issues,
                 :collection => {:bulk_edit => [:get, :post], :bulk_update => :post} do |issues|