summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-05-05 01:01:29 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-05-05 01:01:29 +0000
commitb0414ec1fbabfa8fa84e69eedcf7617fb969fd82 (patch)
tree9c3f633024197ef7756a40c584a25d6545944306 /config
parent569e1b37cc0893cd8b1015a6d12212b205f0fbdf (diff)
downloadredmine-b0414ec1fbabfa8fa84e69eedcf7617fb969fd82.tar.gz
redmine-b0414ec1fbabfa8fa84e69eedcf7617fb969fd82.zip
route: scm: split entry and raw actions
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9625 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb26
1 files changed, 8 insertions, 18 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 22c61acb8..384f6b938 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -222,16 +222,10 @@ RedmineApp::Application.routes.draw do
post 'projects/:id/repository/:repository_id/revisions/:rev/issues', :to => 'repositories#add_related_issue'
delete 'projects/:id/repository/:repository_id/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
get 'projects/:id/repository/:repository_id/revisions', :to => 'repositories#revisions'
- get 'projects/:id/repository/:repository_id/revisions/:rev/:format(/*path(.:ext))',
- :to => 'repositories#entry',
- :constraints => {
- :format => 'raw',
- :rev => /[a-z0-9\.\-_]+/
- }
get 'projects/:id/repository/:repository_id/revisions/:rev/:action(/*path(.:ext))',
:controller => 'repositories',
:constraints => {
- :action => /(browse|show|entry|annotate|diff)/,
+ :action => /(browse|show|entry|raw|annotate|diff)/,
:rev => /[a-z0-9\.\-_]+/
}
@@ -246,24 +240,20 @@ RedmineApp::Application.routes.draw do
get 'projects/:id/repository/revision', :to => 'repositories#revision'
post 'projects/:id/repository/revisions/:rev/issues', :to => 'repositories#add_related_issue'
delete 'projects/:id/repository/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
- get 'projects/:id/repository/revisions/:rev/:format(/*path(.:ext))',
- :to => 'repositories#entry',
- :constraints => {
- :format => 'raw',
- :rev => /[a-z0-9\.\-_]+/
- }
get 'projects/:id/repository/revisions/:rev/:action(/*path(.:ext))',
:controller => 'repositories',
:constraints => {
- :action => /(browse|show|entry|annotate|diff)/,
+ :action => /(browse|show|entry|raw|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/:action(/*path(.:ext))',
+ :controller => 'repositories',
+ :action => /(browse|show|entry|raw|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/:action(/*path(.:ext))',
+ :controller => 'repositories',
+ :action => /(browse|show|entry|raw|changes|annotate|diff)/
get 'projects/:id/repository', :to => 'repositories#show', :path => nil
# additional routes for having the file name at the end of url