Merge branch 'master' into cancancan

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 729e71efa3ad94446d80ef445cfe2b56802785c5..7d9c8dbec9f5778d7b61ff602b9275b62baf281c 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -274,8 +274,6 @@ 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" # 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