Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2024-11-10 13:18:43 +01:00
158 changed files with 2872 additions and 936 deletions

View File

@@ -45,15 +45,17 @@ namespace :api, format: false do
resources :list, only: :show
end
get '/streaming', to: 'streaming#index'
get '/streaming/(*any)', to: 'streaming#index'
with_options to: 'streaming#index' do
get '/streaming'
get '/streaming/(*any)'
end
resources :custom_emojis, only: [:index]
resources :suggestions, only: [:index, :destroy]
resources :scheduled_statuses, only: [:index, :show, :update, :destroy]
resources :preferences, only: [:index]
resources :annual_reports, only: [:index] do
resources :annual_reports, only: [:index, :show] do
member do
post :read
end