]> source.dussan.org Git - redmine.git/commitdiff
route: scm: add revision requirements for git/mercurial branches (#10026)
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sat, 21 Jan 2012 05:16:02 +0000 (05:16 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sat, 21 Jan 2012 05:16:02 +0000 (05:16 +0000)
hgsubversion mirror (https://bitbucket.org/redmine/redmine-all) has
"../sandbox/rails-2.3" and "../sandbox/rails-2.2" *named* branches.

"View revisions" link of "../sandbox/rails-2.3" generates
"repository/revisions/..%2Fsandbox%2Frails-2.3/changes".
But, passenger returns "Not Found".

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

config/routes.rb

index 1a02d02c3374996a0b5a6be1d5f906587e64a9a3..3cee3242be943011b5064cc308e51e399ee57265 100644 (file)
@@ -250,7 +250,10 @@ ActionController::Routing::Routes.draw do |map|
       repository_views.connect 'projects/:id/repository/revisions/:rev/raw/*path',
                                :action => 'entry', :format => 'raw'
       repository_views.connect 'projects/:id/repository/revisions/:rev/:action/*path',
-                               :requirements => { :action => /(browse|show|entry|changes|annotate|diff)/ }
+                               :requirements => { 
+                                   :action => /(browse|show|entry|changes|annotate|diff)/,
+                                   :rev    => /[a-z0-9\.\-_]+/
+                                     }
       repository_views.connect 'projects/:id/repository/raw/*path',
                                :action => 'entry', :format => 'raw'
       repository_views.connect 'projects/:id/repository/:action/*path',
@@ -274,7 +277,10 @@ ActionController::Routing::Routes.draw do |map|
       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)/ }
+                               :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',