From 8047a8cd28d750ae5e97447666b91e6118f40529 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Fri, 27 Apr 2012 16:17:17 +0000 Subject: [PATCH] route: use constraints for repositories ":format => 'raw'" and :action git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9547 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/routes.rb | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index ed26767e3..6757caa87 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -254,12 +254,28 @@ RedmineApp::Application.routes.draw do :action => /(browse|show|entry|changes|annotate|diff)/, :rev => /[a-z0-9\.\-_]+/ } - get 'projects/:id/repository/:repository_id/:format(/*path(.:ext))', :to => 'repositories#entry', :format => /raw/ - get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))', :controller => 'repositories', :action => /(browse|show|entry|changes|annotate|diff)/ + get 'projects/:id/repository/:repository_id/:format(/*path(.:ext))', + :to => 'repositories#entry', + :constraints => { + :format => 'raw' + } + get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))', + :controller => 'repositories', + :constraints => { + :action => /(browse|entry|changes|annotate|diff)/ + } get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil - get 'projects/:id/repository/:format(/*path(.:ext))', :to => 'repositories#entry', :format => /raw/ - get 'projects/:id/repository/:action(/*path(.:ext))', :controller => 'repositories', :action => /(browse|show|entry|changes|annotate|diff)/ + get 'projects/:id/repository/:format(/*path(.:ext))', + :to => 'repositories#entry', + :constraints => { + :format => 'raw' + } + get 'projects/:id/repository/:action(/*path(.:ext))', + :controller => 'repositories', + :constraints => { + :action => /(browse|entry|changes|annotate|diff)/ + } get 'projects/:id/repository', :to => 'repositories#show', :path => nil # additional routes for having the file name at the end of url -- 2.39.5