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

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 16ba85754f3684b6ea7c5835b48694b4d4568832..6a3efe3b05674370850163e370c9ccade1452c1b 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -67,6 +67,7 @@ OpenStreetMap::Application.routes.draw do
     get "user/:id" => "user#api_read", :id => /\d+/
     get "user/details" => "user#api_details"
     get "user/gpx_files" => "user#api_gpx_files"
+    get "users" => "user#api_users", :as => :api_users
 
     get "user/preferences" => "user_preferences#read"
     get "user/preferences/:preference_key" => "user_preferences#read_one"
@@ -312,4 +313,9 @@ OpenStreetMap::Application.routes.draw do
 
   # redactions
   resources :redactions
+
+  # errors
+  match "/403", :to => "errors#forbidden", :via => :all
+  match "/404", :to => "errors#not_found", :via => :all
+  match "/500", :to => "errors#internal_server_error", :via => :all
 end