Merge tag 'v3.0.1' into instance_only_statuses

2019-10-21 09:14:53 +02:00
parent fbaaf24be8 c4118ba71b
commit a42a98bc67
1034 changed files with 32987 additions and 15887 deletions
--- a/app/serializers/rest/credential_account_serializer.rb
+++ b/app/serializers/rest/credential_account_serializer.rb
@ -13,6 +13,7 @@ class REST::CredentialAccountSerializer < REST::AccountSerializer
      federation: user.setting_default_federation,
      note: object.note,
      fields: object.fields.map(&:to_h),
+      follow_requests_count: FollowRequest.where(target_account: object).limit(40).count,
    }
  end
 end