mastodon/app/serializers/activitypub
Claire a4fc7ac922 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/home_controller.rb`:
  Upstream made it so `/web` is available to non-logged-in users
  and `/` redirects to `/web` instead of `/about`.
  Kept our version since glitch-soc's WebUI doesn't have what's
  needed yet and I think /about is still a much better landing
  page anyway.
- `app/models/form/admin_settings.rb`:
  Upstream added new settings, and glitch-soc had an extra setting.
  Not really a conflict.
  Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a new `server` initial state object.
  Not really a conflict.
  Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
  Upstream added new settings.
  Not really a conflict.
  Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Upstream refactored that part and removed the file.
  Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
  Upstream added new settings.
  Not a real conflict.
  Added upstream's new settings.
2022-10-02 18:46:22 +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 Refactor account and status formatting (#17877) 2022-03-28 01:17:17 +02: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 Change how hashtags are normalized (#18795) 2022-07-13 15:03:28 +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 2022-03-26 19:18:55 +01: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 Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01: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