X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/396d8ce31348878001a1f5541d9d403d01a04212..073faf895075ff4ea986f80da53832ab8511db45:/config/routes.rb?ds=sidebyside diff --git a/config/routes.rb b/config/routes.rb index 1b5d483c6..6656d0cd5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -82,15 +82,15 @@ ActionController::Routing::Routes.draw do |map| map.connect '/browse/relation/:id', :controller => 'browse', :action => 'relation', :id => /\d+/ map.connect '/browse/relation/:id/history', :controller => 'browse', :action => 'relation_history', :id => /\d+/ map.connect '/browse/changeset/:id', :controller => 'browse', :action => 'changeset', :id => /\d+/ - map.connect '/browse/changesets', :controller => 'changeset', :action => 'list', :format => 'rhtml' - map.connect '/browse/changesets/rss', :controller => 'changeset', :action => 'list', :format => 'rxml' + map.connect '/browse/changesets', :controller => 'changeset', :action => 'list' + map.connect '/browse/changesets/rss', :controller => 'changeset', :action => 'list', :format => :rss # web site map.root :controller => 'site', :action => 'index' map.connect '/', :controller => 'site', :action => 'index' map.connect '/edit', :controller => 'site', :action => 'edit' - map.connect '/history', :controller => 'changeset', :action => 'list_bbox', :format => 'rhtml' - map.connect '/history/rss', :controller => 'changeset', :action => 'list_bbox', :format => 'rxml' + map.connect '/history', :controller => 'changeset', :action => 'list' + map.connect '/history/rss', :controller => 'changeset', :action => 'list', :format => :rss map.connect '/export', :controller => 'site', :action => 'export' map.connect '/login', :controller => 'user', :action => 'login' map.connect '/logout', :controller => 'user', :action => 'logout' @@ -144,8 +144,8 @@ ActionController::Routing::Routes.draw do |map| # user pages map.connect '/user/:display_name', :controller => 'user', :action => 'view' - map.connect '/user/:display_name/edits', :controller => 'changeset', :action => 'list_user', :format => 'rhtml' - map.connect '/user/:display_name/edits/rss', :controller => 'changeset', :action => 'list_user', :format => 'rxml' + map.connect '/user/:display_name/edits', :controller => 'changeset', :action => 'list' + map.connect '/user/:display_name/edits/rss', :controller => 'changeset', :action => 'list', :format =>:rss map.connect '/user/:display_name/make_friend', :controller => 'user', :action => 'make_friend' map.connect '/user/:display_name/remove_friend', :controller => 'user', :action => 'remove_friend' map.connect '/user/:display_name/diary', :controller => 'diary_entry', :action => 'list'