Remove ancient (and unused) composite_primary_keys gem

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 0a617b6a30a8ed4c766c43704dd599b0aa1a52cc..71af08b73d46a81d7dfa19939aef5126d83e32b9 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -86,15 +86,17 @@ OpenStreetMap::Application.routes.draw do
   match '/browse/changeset/:id' => 'browse#changeset', :as => :changeset, :id => /\d+/
   match '/user/:display_name/edits' => 'changeset#list'
   match '/user/:display_name/edits/feed' => 'changeset#feed', :format => :atom
+  match '/browse/friends' => 'changeset#list', :friends => true
+  match '/browse/nearby' => 'changeset#list', :nearby => true
   match '/browse/changesets' => 'changeset#list'
   match '/browse/changesets/feed' => 'changeset#feed', :format => :atom
   match '/browse' => 'changeset#list'
 
   # web site
-  match '/' => 'site#index'
+  root :to => 'site#index'
   match '/edit' => 'site#edit'
-  match '/copyright' => 'site#copyright'
   match '/copyright/:copyright_locale' => 'site#copyright'
+  match '/copyright' => 'site#copyright'
   match '/history' => 'changeset#list'
   match '/history/feed' => 'changeset#feed', :format => :atom
   match '/export' => 'site#export'
@@ -153,6 +155,8 @@ OpenStreetMap::Application.routes.draw do
 
   # diary pages
   match '/diary/new' => 'diary_entry#new'
+  match '/diary/friends' => 'diary_entry#list', :friends => true
+  match '/diary/nearby' => 'diary_entry#list', :nearby => true  
   match '/user/:display_name/diary/rss' => 'diary_entry#rss', :format => :rss
   match '/diary/:language/rss' => 'diary_entry#rss', :format => :rss
   match '/diary/rss' => 'diary_entry#rss', :format => :rss