cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2024-08-18 11:59:42 +01:00
commit 71d459c71c
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/routes.rb
View file

@ -331,7 +331,7 @@ OpenStreetMap::Application.routes.draw do
get "/user/:display_name/blocks" => "user_blocks#blocks_on", :as => "user_blocks_on" 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 "/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" get "/blocks/new/:display_name" => "user_blocks#new", :as => "new_user_block"
resources :user_blocks resources :user_blocks, :except => :new
match "/blocks/:id/revoke" => "user_blocks#revoke", :via => [:get, :post], :as => "revoke_user_block" match "/blocks/:id/revoke" => "user_blocks#revoke", :via => [:get, :post], :as => "revoke_user_block"
match "/user/:display_name/blocks/revoke_all" => "user_blocks#revoke_all", :via => [:get, :post], :as => "revoke_all_user_blocks" match "/user/:display_name/blocks/revoke_all" => "user_blocks#revoke_all", :via => [:get, :post], :as => "revoke_all_user_blocks"

4
test/controllers/user_blocks_controller_test.rb
View file

@ -13,10 +13,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
{ :path => "/user_blocks", :method => :get }, { :path => "/user_blocks", :method => :get },
{ :controller => "user_blocks", :action => "index" } { :controller => "user_blocks", :action => "index" }
) )
assert_routing(
{ :path => "/user_blocks/new", :method => :get },
{ :controller => "user_blocks", :action => "new" }
)
assert_routing( assert_routing(
{ :path => "/user_blocks", :method => :post }, { :path => "/user_blocks", :method => :post },
{ :controller => "user_blocks", :action => "create" } { :controller => "user_blocks", :action => "create" }