From: Tom Hughes Date: Wed, 3 Feb 2021 14:48:24 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/3078' X-Git-Tag: live~1790 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/66b5e85845547e6f3c6dba59952217f5882b0271?hp=-c Merge remote-tracking branch 'upstream/pull/3078' --- 66b5e85845547e6f3c6dba59952217f5882b0271 diff --combined config/routes.rb index 5f904f06e,bd6f3034d..97cedd965 --- a/config/routes.rb +++ b/config/routes.rb @@@ -59,6 -59,8 +59,6 @@@ OpenStreetMap::Application.routes.draw get "trackpoints" => "api/tracepoints#index" - get "changes" => "api/changes#index" - get "user/:id" => "api/users#show", :id => /\d+/, :as => :api_user get "user/details" => "api/users#details" get "user/gpx_files" => "api/users#gpx_files" @@@ -171,7 -173,7 +171,7 @@@ # omniauth get "/auth/failure" => "users#auth_failure" match "/auth/:provider/callback" => "users#auth_success", :via => [:get, :post], :as => :auth_success - match "/auth/:provider" => "users#auth", :via => [:get, :post], :as => :auth + post "/auth/:provider" => "users#auth", :as => :auth # permalink get "/go/:code" => "site#permalink", :code => /[a-zA-Z0-9_@~]+[=-]*/, :as => :permalink