diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-10-24 09:23:59 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-10-24 09:23:59 +0000 |
| commit | 2beae77c587128445955f84a262d6cd791add0cf (patch) | |
| tree | 7e3b98dc8f7431eb8772cc1a02fbf12fafe3c1ac | |
| parent | 440232a54de1ec95fba67ef6c67efa9a1a369628 (diff) | |
| download | redmine-2beae77c587128445955f84a262d6cd791add0cf.tar.gz redmine-2beae77c587128445955f84a262d6cd791add0cf.zip | |
backout r10707 (#12196)
fix "Page not found" on OK button in SCM "View all revisions" page.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10708 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | config/routes.rb | 7 | ||||
| -rw-r--r-- | test/integration/routing/repositories_test.rb | 24 |
2 files changed, 12 insertions, 19 deletions
diff --git a/config/routes.rb b/config/routes.rb index 2c505693d..ca9d77590 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -221,9 +221,7 @@ RedmineApp::Application.routes.draw do :to => 'repositories#changes' get 'projects/:id/repository/:repository_id/revisions/:rev', :to => 'repositories#revision' - match 'projects/:id/repository/:repository_id/revision', - :to => 'repositories#revision', - :via => [:get, :post] + get 'projects/:id/repository/:repository_id/revision', :to => 'repositories#revision' 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' @@ -243,8 +241,7 @@ RedmineApp::Application.routes.draw do get 'projects/:id/repository/revisions', :to => 'repositories#revisions' get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision' - match 'projects/:id/repository/revision', :to => 'repositories#revision', - :via => [:get, :post] + 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/:action(/*path(.:ext))', diff --git a/test/integration/routing/repositories_test.rb b/test/integration/routing/repositories_test.rb index a6d9fadae..fc4b54c6c 100644 --- a/test/integration/routing/repositories_test.rb +++ b/test/integration/routing/repositories_test.rb @@ -321,13 +321,11 @@ class RoutingRepositoriesTest < ActionController::IntegrationTest { :controller => 'repositories', :action => 'changes', :id => 'redmine', :path => @path_hash[:param] } ) - ["get", "post"].each do |method| - assert_routing( - { :method => method, - :path => "/projects/redmine/repository/revision" }, - { :controller => 'repositories', :action => 'revision', :id => 'redmine' } - ) - end + assert_routing( + { :method => 'get', + :path => "/projects/redmine/repository/revision" }, + { :controller => 'repositories', :action => 'revision', :id => 'redmine' } + ) end def test_repositories_non_revisions_path_with_repository_id @@ -394,13 +392,11 @@ class RoutingRepositoriesTest < ActionController::IntegrationTest { :controller => 'repositories', :action => 'changes', :id => 'redmine', :repository_id => 'foo', :path => @path_hash[:param] } ) - ["get", "post"].each do |method| - assert_routing( - { :method => method, - :path => "/projects/redmine/repository/foo/revision" }, - { :controller => 'repositories', :action => 'revision', :id => 'redmine', :repository_id => 'foo'} - ) - end + assert_routing( + { :method => 'get', + :path => "/projects/redmine/repository/foo/revision" }, + { :controller => 'repositories', :action => 'revision', :id => 'redmine', :repository_id => 'foo'} + ) end def test_repositories_related_issues |