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	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
activity_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
actor_serializer.rb	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
add_serializer.rb	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
block_serializer.rb	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
collection_serializer.rb	Add featured hashtags as an ActivityPub collection (#11595)	2020-09-02 02:11:12 +02:00
delete_actor_serializer.rb	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
delete_serializer.rb	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
device_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
emoji_serializer.rb	Fix activity being rendered within activity due to caching (#11271)	2019-07-10 00:43:30 +02:00
encrypted_message_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
flag_serializer.rb	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
follow_serializer.rb	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
hashtag_serializer.rb	Add featured hashtags as an ActivityPub collection (#11595)	2020-09-02 02:11:12 +02:00
image_serializer.rb	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
like_serializer.rb	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
move_serializer.rb	Add account migration UI (#11846)	2019-09-19 20:58:19 +02:00
note_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-17 10:30:34 +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	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
reject_follow_serializer.rb	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
remove_serializer.rb	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
undo_announce_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
undo_block_serializer.rb	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
undo_follow_serializer.rb	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
undo_like_serializer.rb	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
update_poll_serializer.rb	Fix account URI in UpdatePollSerializer (#11194)	2019-06-27 19:41:55 +02:00
update_serializer.rb	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00
vote_serializer.rb	Remove unused ActivityPub @context values depending on response (#10378)	2019-03-27 15:55:23 +01:00