Thibaut Girka e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict caused because we have additional code to make sure pinned local-only toots don't get rendered on the ActivityPub endpoints. Ported upstream changes.		2020-09-07 09:21:38 +02:00
..
accept_follow_serializer.rb
activity_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
actor_serializer.rb	Add outbox attribute to instance actor (#14721)	2020-09-02 18:42:50 +02:00
add_serializer.rb
block_serializer.rb
collection_serializer.rb	Add featured hashtags as an ActivityPub collection (#11595)	2020-09-02 02:11:12 +02:00
delete_actor_serializer.rb
delete_serializer.rb
device_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
emoji_serializer.rb
encrypted_message_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
flag_serializer.rb
follow_serializer.rb
hashtag_serializer.rb	Add featured hashtags as an ActivityPub collection (#11595)	2020-09-02 02:11:12 +02:00
image_serializer.rb
like_serializer.rb
move_serializer.rb
note_serializer.rb	Add support for direct message assertions	2020-08-04 19:43:19 +02:00
one_time_key_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
outbox_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
public_key_serializer.rb
reject_follow_serializer.rb
remove_serializer.rb
undo_announce_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
undo_block_serializer.rb
undo_follow_serializer.rb
undo_like_serializer.rb
update_poll_serializer.rb
update_serializer.rb
vote_serializer.rb