Merge commit '2f932cb2bb' into kb_migration

This commit is contained in:
KMY 2023-08-03 15:48:07 +09:00
commit 82d61dad96
65 changed files with 909 additions and 162 deletions

View file

@ -22,7 +22,7 @@ class InitialStateSerializer < ActiveModel::Serializer
repository: Mastodon::Version.repository,
source_url: instance_presenter.source_url,
version: instance_presenter.version,
limited_federation_mode: Rails.configuration.x.whitelist_mode,
limited_federation_mode: Rails.configuration.x.limited_federation_mode,
mascot: instance_presenter.mascot&.file&.url,
profile_directory: Setting.profile_directory,
trends_enabled: Setting.trends,