diff --git a/config/routes.rb b/config/routes.rb index d905ce654..d5794c913 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -233,10 +233,39 @@ ActionController::Routing::Routes.draw do |map| repositories.with_options :conditions => {:method => :get} do |repository_views| repository_views.connect 'projects/:id/repository', :action => 'show' + + repository_views.connect 'projects/:id/repository/:repository_id/statistics', + :action => 'stats' + repository_views.connect 'projects/:id/repository/:repository_id/graph', + :action => 'graph' + repository_views.connect 'projects/:id/repository/statistics', :action => 'stats' repository_views.connect 'projects/:id/repository/graph', :action => 'graph' + + repository_views.connect 'projects/:id/repository/:repository_id/revisions', + :action => 'revisions' + repository_views.connect 'projects/:id/repository/:repository_id/revisions.:format', + :action => 'revisions' + repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev', + :action => 'revision' + repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/diff', + :action => 'diff' + repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/diff.:format', + :action => 'diff' + repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/raw/*path', + :action => 'entry', :format => 'raw' + repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/:action/*path', + :requirements => { + :action => /(browse|show|entry|changes|annotate|diff)/, + :rev => /[a-z0-9\.\-_]+/ + } + repository_views.connect 'projects/:id/repository/:repository_id/raw/*path', + :action => 'entry', :format => 'raw' + repository_views.connect 'projects/:id/repository/:repository_id/:action/*path', + :requirements => { :action => /(browse|show|entry|changes|annotate|diff)/ } + repository_views.connect 'projects/:id/repository/revisions', :action => 'revisions' repository_views.connect 'projects/:id/repository/revisions.:format', @@ -259,32 +288,6 @@ ActionController::Routing::Routes.draw do |map| repository_views.connect 'projects/:id/repository/:action/*path', :requirements => { :action => /(browse|show|entry|changes|annotate|diff)/ } - # Same routes with a repository_id - repository_views.connect 'projects/:id/repository/:repository_id/statistics', - :action => 'stats' - repository_views.connect 'projects/:id/repository/:repository_id/graph', - :action => 'graph' - repository_views.connect 'projects/:id/repository/:repository_id/revisions', - :action => 'revisions' - repository_views.connect 'projects/:id/repository/:repository_id/revisions.:format', - :action => 'revisions' - repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev', - :action => 'revision' - repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/diff', - :action => 'diff' - repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/diff.:format', - :action => 'diff' - repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/raw/*path', - :action => 'entry', :format => 'raw' - repository_views.connect 'projects/:id/repository/:repository_id/revisions/:rev/:action/*path', - :requirements => { - :action => /(browse|show|entry|changes|annotate|diff)/, - :rev => /[a-z0-9\.\-_]+/ - } - repository_views.connect 'projects/:id/repository/:repository_id/raw/*path', - :action => 'entry', :format => 'raw' - repository_views.connect 'projects/:id/repository/:repository_id/:action/*path', - :requirements => { :action => /(browse|show|entry|changes|annotate|diff)/ } repository_views.connect 'projects/:id/repository/:repository_id', :action => 'show' end