Claire 0e74d4da59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Changed upstream, while we modified it in glitch-soc to not get spammed by dependabot. Kept it removed. - `README.md`: Changed upstream, which has a very different version. Discarded upstream changes.		2022-06-21 08:28:59 +02:00
..
active_record	…
assets	Fix wrong aspect ratio of logo in icons (#18639)	2022-06-11 20:32:02 +02:00
chewy/strategy	Change search indexing to use batches to minimize resource usage (#18451)	2022-05-18 23:29:14 +02:00
devise	…
generators	…
json_ld	…
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-26 23:30:10 +02:00
paperclip	Remove dependency on running Redis server for db:setup (#18560)	2022-06-01 19:23:31 +02:00
rails	…
redis	…
sanitize_ext	Fix link sanitization for outgoing text/html and text/markdown toots	2022-04-11 09:06:25 +02:00
tasks	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-21 08:28:59 +02:00
templates	…
terrapin	…
webpacker	…
cli.rb	Add ability for admins to delete canonical email blocks (#16644)	2021-12-17 23:02:14 +01:00
enumerable.rb	…
exceptions.rb	Fix error resposes for `from` search prefix (#17963)	2022-04-08 21:21:49 +02:00