erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Merge 982f507739 into 549ab089ee

Browse source
This commit is contained in:
Matt Jankowski 2024-07-31 11:06:50 +00:00 committed by GitHub
commit 29b4a27570
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/routes/admin.rb
View file

@ -40,8 +40,10 @@ namespace :admin do
end end
end end
get '/settings', to: redirect('/admin/settings/branding') with_options to: redirect('/admin/settings/branding') do
get '/settings/edit', to: redirect('/admin/settings/branding') get '/settings'
get '/settings/edit'
end
namespace :settings do namespace :settings do
resource :branding, only: [:show, :update], controller: 'branding' resource :branding, only: [:show, :update], controller: 'branding'

6
config/routes/api.rb
View file

@ -44,8 +44,10 @@ namespace :api, format: false do
resources :list, only: :show resources :list, only: :show
end end
get '/streaming', to: 'streaming#index' with_options to: 'streaming#index' do
get '/streaming/(*any)', to: 'streaming#index' get '/streaming'
get '/streaming/(*any)'
end
resources :custom_emojis, only: [:index] resources :custom_emojis, only: [:index]
resources :suggestions, only: [:index, :destroy] resources :suggestions, only: [:index, :destroy]