From: Matt Amos <zerebubuth@gmail.com>
Date: Fri, 31 Jul 2009 10:42:06 +0000 (+0000)
Subject: Merged 16488:16743 from trunk.
X-Git-Tag: live~7555^2~17
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/05e212027339733cf39aa9b7536c3f5f69ba0962

Merged 16488:16743 from trunk.
---

05e212027339733cf39aa9b7536c3f5f69ba0962
diff --cc config/routes.rb
index a4e88cc99,5ac2d744a..0ce2f051d
--- a/config/routes.rb
+++ b/config/routes.rb
@@@ -193,15 -194,8 +193,16 @@@ ActionController::Routing::Routes.draw 
    map.connect '/message/read/:message_id', :controller => 'message', :action => 'read'
    map.connect '/message/mark/:message_id', :controller => 'message', :action => 'mark'
    map.connect '/message/reply/:message_id', :controller => 'message', :action => 'reply'
+   map.connect '/message/delete/:message_id', :controller => 'message', :action => 'delete'
  
 +  # oauth admin pages (i.e: for setting up new clients, etc...)
 +  map.resources :oauth_clients
 +  map.connect '/oauth/revoke', :controller => 'oauth', :action => 'revoke'
 +  map.authorize '/oauth/authorize', :controller => 'oauth', :action => 'oauthorize'
 +  map.request_token '/oauth/request_token', :controller => 'oauth', :action => 'request_token'
 +  map.access_token '/oauth/access_token', :controller => 'oauth', :action => 'access_token'
 +  map.test_request '/oauth/test_request', :controller => 'oauth', :action => 'test_request'
 +
    # fall through
    map.connect ':controller/:id/:action'
    map.connect ':controller/:action'
diff --cc db/migrate/038_create_oauth_tables.rb
index 95d690512,000000000..95d690512
mode 100644,000000..100644
--- a/db/migrate/038_create_oauth_tables.rb
+++ b/db/migrate/038_create_oauth_tables.rb
diff --cc db/migrate/039_add_fine_o_auth_permissions.rb
index ad4c7a8a4,000000000..ad4c7a8a4
mode 100644,000000..100644
--- a/db/migrate/039_add_fine_o_auth_permissions.rb
+++ b/db/migrate/039_add_fine_o_auth_permissions.rb