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

2023-11-16 22:58:29 +09:00 · 2023-11-16 22:58:29 +09:00 · 236fc2a316
commit 236fc2a316
parent 9ba8d8f848 c94bedf4e6
162 changed files with 1918 additions and 1207 deletions
--- a/app/javascript/mastodon/models/account.ts
+++ b/app/javascript/mastodon/models/account.ts
@ -86,6 +86,7 @@ export const accountDefaultValues: AccountShape = {
  bot: false,
  created_at: '',
  discoverable: false,
+  indexable: false,
  display_name: '',
  display_name_html: '',
  emojis: List<CustomEmoji>(),