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

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 84e5e861947075ad2af5f7f77aea6ea0c37f1d27..19dfc9a7729519c26285160ff1d3d68a36c157c7 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -322,10 +322,11 @@ OpenStreetMap::Application.routes.draw do
 
   # messages
   resources :messages, :path_names => { :new => "new/:display_name" }, :id => /\d+/, :only => [:new, :create, :show, :destroy] do
-    post :mark
-    patch :unmute
-
-    resource :reply, :module => :messages, :path_names => { :new => "new" }, :only => :new
+    scope :module => :messages do
+      resource :reply, :path_names => { :new => "new" }, :only => :new
+      resource :read_mark, :only => [:create, :destroy]
+      resource :mute, :only => :destroy
+    end
   end
   namespace :messages, :path => "/messages" do
     resource :inbox, :only => :show