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

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index b068d997028d819b5bd55893042f0629f8d2a04c..6d6acc7db34654bfe024a1f1acb556476b8208f2 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -314,7 +314,7 @@ OpenStreetMap::Application.routes.draw do
     post :mark
     patch :unmute
 
     post :mark
     patch :unmute
 

-    match :reply, :via => [:get, :post]
+    resource :reply, :module => :messages, :path_names => { :new => "new" }, :only => :new

   end
   namespace :messages, :path => "/messages" do
     resource :inbox, :only => :show
   end
   namespace :messages, :path => "/messages" do
     resource :inbox, :only => :show


@@ -325,6 +325,7 @@ OpenStreetMap::Application.routes.draw do
   get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox")
   get "/message/new/:display_name", :to => redirect(:path => "/messages/new/%{display_name}")
   get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}")
   get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox")
   get "/message/new/:display_name", :to => redirect(:path => "/messages/new/%{display_name}")
   get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}")

+  get "/messages/:message_id/reply", :to => redirect(:path => "/messages/%{message_id}/reply/new")

 
   # muting users
   scope "/user/:display_name" do
 
   # muting users
   scope "/user/:display_name" do