Merge remote-tracking branch 'upstream/pull/2014'

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 2750485b905be1066bdf215a81d94dd6f66bfd57..729e71efa3ad94446d80ef445cfe2b56802785c5 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -262,7 +262,9 @@ OpenStreetMap::Application.routes.draw do
   get "/export/embed" => "export#embed"
 
   # messages
-  resources :messages, :only => [:create, :show] do
+  resources :messages, :only => [:create, :show, :destroy] do
+    post :mark
+    match :reply, :via => [:get, :post]
     collection do
       get :inbox
       get :outbox
@@ -272,9 +274,8 @@ OpenStreetMap::Application.routes.draw do
   get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox")
   get "/message/new/:display_name" => "messages#new", :as => "new_message"
   get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}")
-  post "/message/mark/:message_id" => "messages#mark", :as => "mark_message"
-  match "/message/reply/:message_id" => "messages#reply", :via => [:get, :post], :as => "reply_message"
-  post "/message/delete/:message_id" => "messages#destroy", :as => "destroy_message"
+  post "/message/mark/:message_id" => "messages#mark" # remove after deployment
+  match "/message/reply/:message_id" => "messages#reply", :via => [:get, :post] # remove after deployment
 
   # oauth admin pages (i.e: for setting up new clients, etc...)
   scope "/user/:display_name" do