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
..
action_dispatch	…
active_record	…
assets	…
chewy/strategy	…
devise	…
generators	…
json_ld	…
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 22:14:26 +02:00
paperclip	Switch from unmaintained paperclip to kt-paperclip (#16724)	2021-09-29 23:52:36 +02:00
rails	…
redis	…
sanitize_ext	…
tasks	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-13 17:57:15 +02:00
templates	…
terrapin	Add Ruby 3.0 support (#16046)	2021-05-06 14:22:54 +02:00
webpacker	…
cli.rb	Fix tootctl self-destruct not sending Delete activities for recently-suspended accounts (#16688)	2021-10-14 19:59:28 +02:00
enumerable.rb	…
exceptions.rb	Fix media redownload worker retrying on unexpected response codes (#16111)	2021-05-05 23:46:59 +02:00