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

Conflicts:
- `README.md`:
  Upstream added some documentation in the README, but our README is pretty
  different and barebone.
  Kept our README.

2021-10-14 22:14:26 +02:00

..

controllers

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

2021-10-13 15:50:24 +02:00

fabricators

Add feature to automatically delete old toots (#16529)

2021-08-09 23:11:50 +02:00

features

…

fixtures

Switch from unmaintained paperclip to kt-paperclip (#16724)

2021-09-29 23:52:36 +02:00

helpers

…

lib

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

2021-09-26 18:28:59 +02:00

mailers

…

models

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

2021-10-14 22:14:26 +02:00

policies

…

presenters

Change references to tootsuite/mastodon to mastodon/mastodon (#16491)

2021-07-13 15:46:20 +02:00

requests

…

routing

…

serializers/activitypub

…

services

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

2021-10-14 21:44:57 +02:00

support

…

validators

…

views

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

2021-10-13 15:50:24 +02:00

workers

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

2021-08-11 17:48:42 +02:00

rails_helper.rb

…

spec_helper.rb

…