Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.		2021-11-26 22:53:55 +01:00
..
accept_follow_serializer.rb
activity_serializer.rb
actor_serializer.rb	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01: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
emoji_serializer.rb
encrypted_message_serializer.rb
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	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-17 10:30:34 +02:00
one_time_key_serializer.rb
outbox_serializer.rb
public_key_serializer.rb
reject_follow_serializer.rb
remove_serializer.rb
undo_announce_serializer.rb
undo_block_serializer.rb
undo_follow_serializer.rb
undo_like_serializer.rb
update_poll_serializer.rb
update_serializer.rb
vote_serializer.rb