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

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 099c285fce51b28c610bf9100c402cd7ee59d426..b0e23301e998bd42e7f945df18b22357f9057021 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -333,8 +333,7 @@ OpenStreetMap::Application.routes.draw do
   get "/user/:display_name/blocks" => "user_blocks#blocks_on", :as => "user_blocks_on"
   get "/user/:display_name/blocks_by" => "user_blocks#blocks_by", :as => "user_blocks_by"
   get "/blocks/new/:display_name" => "user_blocks#new", :as => "new_user_block"
-  resources :user_blocks
-  match "/blocks/:id/revoke" => "user_blocks#revoke", :via => [:get, :post], :as => "revoke_user_block"
+  resources :user_blocks, :except => :new
   match "/user/:display_name/blocks/revoke_all" => "user_blocks#revoke_all", :via => [:get, :post], :as => "revoke_all_user_blocks"
 
   # issues and reports