summaryrefslogtreecommitdiffstats
path: root/config/routes.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-10-21 18:46:26 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-10-21 18:46:26 +0000
commitd66b3452db773e2d9faf2452595ab3e8d136d843 (patch)
tree38ce910cf45c26789fdb1009f381aa1243e3d814 /config/routes.rb
parent9ec142713d5eb4c2f45fec02d6062165efe312c7 (diff)
downloadredmine-d66b3452db773e2d9faf2452595ab3e8d136d843.tar.gz
redmine-d66b3452db773e2d9faf2452595ab3e8d136d843.zip
Wiki page versions routes cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10687 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 63f779a16..b78cb3dff 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -143,8 +143,6 @@ RedmineApp::Application.routes.draw do
end
match 'wiki/index', :controller => 'wiki', :action => 'index', :via => :get
- match 'wiki/:id/diff/:version/vs/:version_from', :controller => 'wiki', :action => 'diff'
- match 'wiki/:id/diff/:version', :controller => 'wiki', :action => 'diff'
resources :wiki, :except => [:index, :new, :create] do
member do
get 'rename'
@@ -161,7 +159,9 @@ RedmineApp::Application.routes.draw do
end
end
match 'wiki', :controller => 'wiki', :action => 'show', :via => :get
- match 'wiki/:id/annotate/:version', :controller => 'wiki', :action => 'annotate'
+ get 'wiki/:id/:version', :to => 'wiki#show'
+ get 'wiki/:id/:version/annotate', :to => 'wiki#annotate'
+ get 'wiki/:id/:version/diff', :to => 'wiki#diff'
end
resources :issues do