gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge master tidy routes

Browse source
This commit is contained in:
Michael Ball 2021-03-24 13:32:40 -07:00
commit de8b06c4b3
120 changed files with 1321 additions and 1293 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/routes.rb
View file

@ -221,8 +221,8 @@ Osem::Application.routes.draw do
end
end
get '/admin' => redirect('/admin/conferences')
# Handle conferences on custom domains.
# This *must* come before any other root definition.
constraints DomainConstraint do
root to: 'conferences#show'
end
@ -233,5 +233,7 @@ Osem::Application.routes.draw do
root to: 'conferences#index', via: [:get, :options]
end
get '/admin' => redirect('/admin/conferences')
get '/calendar' => 'conferences#calendar'
get '/.well-known/apple-developer-merchantid-domain-association', to: 'application#apple_pay'
end