Merge remote-tracking branch 'parent/main' into upstream-20241113

This commit is contained in:
KMY 2024-11-13 08:17:38 +09:00
commit 910eafda63
177 changed files with 1625 additions and 659 deletions

View file

@ -54,8 +54,10 @@ namespace :api, format: false do
resources :antenna, 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 :reaction_deck, only: [:index, :create]
@ -258,7 +260,7 @@ namespace :api, format: false do
resources :featured_tags, only: [:index, :create, :destroy]
resources :polls, only: [:create, :show] do
resources :polls, only: [:show] do
resources :votes, only: :create, module: :polls
end