Claire 59864ff495 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.

2022-03-22 17:00:38 +01:00

..

base_controller.rb

Fix locale not being set in REST API (#17847)

2022-03-22 12:29:04 +01:00

claims_controller.rb

Add E2EE API (#13820)

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

collections_controller.rb

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

2022-01-17 08:28:52 +01:00

followers_synchronizations_controller.rb

Fix followers synchronization mechanism not working when URI has empty path (#16744)

2021-09-15 18:51:16 +02:00

inboxes_controller.rb

Skip processing Update activities on unknown accounts (#15514)

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

outboxes_controller.rb

Fix performance of account timelines (#17709)

2022-03-08 09:14:39 +01:00

replies_controller.rb

Fix replies collection incorrectly looping (#17462)

2022-02-07 17:06:43 +01:00