Reverts r9547 that breaks 2 tests.

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

diff --git a/config/routes.rb b/config/routes.rb
index 09d2f7ea6aa0d1de9baf7c6355515a19d5212163..da4dddd6acf78bdef565f5aff7a8a1a789d1147b 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -254,28 +254,12 @@ 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',
-      :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/: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', :to => 'repositories#show', :path => nil
 
-  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/: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', :to => 'repositories#show', :path => nil
 
   # additional routes for having the file name at the end of url