Claire b6b68b44a1 Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream ... Conflicts: - `Vagrantfile`: Upstream bumped a bunch of values, including one that was already bumped by glitch-soc. Took upstream's version. - `lib/paperclip/transcoder.rb`: glitch-soc already had a partial fix for this. Took upstream's version.		2023-08-24 21:46:17 +02: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	Add support for federating `memorial` attribute (#26583)	2023-08-23 08:27:24 +02:00
add_serializer.rb	Change featured tag updates to add/remove activity (#19409)	2022-10-22 18:30:55 +02: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	Change featured tag updates to add/remove activity (#19409)	2022-10-22 18:30:55 +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	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +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	Refactor ActivityPub handling to prepare for non-Account actors (#19212)	2022-09-21 22:45:57 +02: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	Change featured tag updates to add/remove activity (#19409)	2022-10-22 18:30:55 +02:00
undo_announce_serializer.rb	Fix Undo Announce sometimes inlining the originally Announced status (#17516)	2022-02-11 14:52:07 +01: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