Merge branch 'master' into moderation

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 4694789694e8ddf26a745e8607b0eb562e96d648..8160c878c6304172a4df5c4ac39312ac66b91788 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -246,8 +246,6 @@ OpenStreetMap::Application.routes.draw do
   # geocoder
   match "/search" => "geocoder#search", :via => :get, :as => :search
   match "/geocoder/search_latlon" => "geocoder#search_latlon", :via => :get
-  match "/geocoder/search_us_postcode" => "geocoder#search_us_postcode", :via => :get
-  match "/geocoder/search_uk_postcode" => "geocoder#search_uk_postcode", :via => :get
   match "/geocoder/search_ca_postcode" => "geocoder#search_ca_postcode", :via => :get
   match "/geocoder/search_osm_nominatim" => "geocoder#search_osm_nominatim", :via => :get
   match "/geocoder/search_geonames" => "geocoder#search_geonames", :via => :get
@@ -292,6 +290,7 @@ OpenStreetMap::Application.routes.draw do
 
   # issues and reports
   resources :issues do
+    resources :comments, :controller => :issue_comments
     member do
       post "resolve"
       post "assign"
@@ -302,8 +301,6 @@ OpenStreetMap::Application.routes.draw do
 
   resources :reports
 
-  post "/comment" => "issues#comment"
-
   # redactions
   resources :redactions
 end