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

This commit is contained in:
KMY 2025-03-10 19:58:05 +09:00
commit 5979c0ea1d
345 changed files with 4304 additions and 2540 deletions

View file

@ -65,6 +65,10 @@ namespace :admin do
post :publish
post :unpublish
end
resource :preview, only: [:show], module: :announcements
resource :test, only: [:create], module: :announcements
resource :distribution, only: [:create], module: :announcements
end
with_options to: redirect('/admin/settings/branding') do

View file

@ -88,7 +88,7 @@ namespace :api, format: false do
end
end
resources :media, only: [:create, :update, :show]
resources :media, only: [:create, :update, :show, :destroy]
resources :blocks, only: [:index]
resources :mutes, only: [:index]
resources :favourites, only: [:index]
@ -133,6 +133,8 @@ namespace :api, format: false do
resource :translation_languages, only: [:show]
resource :languages, only: [:show]
resource :activity, only: [:show], controller: :activity
get '/terms_of_service/:date', to: 'terms_of_services#show'
end
end