Merge branch 'main' into glitch-soc/merge-upstream

Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our version.
2023-09-21 15:12:00 +02:00
parent 5efa6ac771 0fbefb6f67
commit f05985f8ec
21 changed files with 1081 additions and 886 deletions
@@ -15,6 +15,9 @@ class REST::CredentialAccountSerializer < REST::AccountSerializer
      note: object.note,
      fields: object.fields.map(&:to_h),
      follow_requests_count: FollowRequest.where(target_account: object).limit(40).count,
+      hide_collections: object.hide_collections,
+      discoverable: object.discoverable,
+      indexable: object.indexable,
    }
  end