From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 27 Apr 2012 17:04:37 +0000 (+0000)
Subject: Reverts r9547 that breaks 2 tests.
X-Git-Tag: 2.0.0~125
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=301e0386f5933dc5d79ac37a8ca245caec5372fb;p=redmine.git

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 09d2f7ea6..da4dddd6a 100644
--- 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