Merge remote-tracking branch 'parent/main' into kb_development

2023-09-27 21:33:12 +09:00 · 2023-09-27 21:33:12 +09:00 · 78ddcb10c3
commit 78ddcb10c3
parent 137b49b02f 57f592fed5
67 changed files with 615 additions and 230 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@ -397,6 +397,7 @@ class Account < ApplicationRecord
  end

  def public_settings
+    # Please update `app/javascript/mastodon/api_types/accounts.ts` when making changes to the attributes
    config = {
      'noindex' => noindex?,
      'noai' => noai?,