Merge tag 'v3.0.0' into hometown-dev

2019-10-08 13:24:20 -07:00
parent bfd29a34eb 83d3e7733d
commit 228e0f0f6e
1012 changed files with 31176 additions and 15165 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