Claire 33d30632fb Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/public_feed.rb`:
  Upstream refactored a bit, glitch-soc had specific code for local-only
  statuses.
  Updated glitch-soc's specific code accordingly.

2021-01-11 11:55:42 +01:00

..

base_controller.rb

Add support for reversible suspensions through ActivityPub (#14989)

2020-11-08 00:28:39 +01:00

claims_controller.rb

Add E2EE API (#13820)

2020-06-02 19:24:53 +02:00

collections_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2020-09-07 09:21:38 +02:00

followers_synchronizations_controller.rb

Add follower synchronization mechanism (#14510)

2020-10-21 18:04:09 +02:00

inboxes_controller.rb

Skip processing Update activities on unknown accounts (#15514)

2021-01-08 12:26:29 +01:00

outboxes_controller.rb

Change REST API to return empty data for suspended accounts (#14765)

2020-09-11 15:16:29 +02:00

replies_controller.rb

Add support for reversible suspensions through ActivityPub (#14989)

2020-11-08 00:28:39 +01:00