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

This commit is contained in:
KMY 2024-09-13 10:31:48 +09:00
commit fc9d27ff91
392 changed files with 3757 additions and 3233 deletions

View file

@ -62,7 +62,7 @@ namespace :settings do
resource :delete, only: [:show, :destroy]
resource :migration, only: [:show, :create]
resource :verification, only: :show
resource :verification, only: [:show, :update]
resource :privacy, only: [:show, :update], controller: 'privacy'
resource :privacy_extra, only: [:show, :update], controller: 'privacy_extra'