Claire b81710c02c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Not a real conflict, glitch-soc quotes the upstream file, which has been changed. Update the quote.		2021-01-26 14:01:30 +01:00
..
assets	…
chewy/strategy	Fix unnecessary queries when batch-removing statuses, 100x faster (#15387)	2020-12-22 17:13:55 +01:00
devise	Fix authentication before 2FA challenge (#11943)	2019-09-24 04:35:36 +02:00
generators	…
json_ld	Fix preloaded JSON-LD context for identity not being used (#12138)	2019-10-10 06:48:53 +02:00
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-26 14:01:30 +01:00
paperclip	Optimize map { ... }.compact calls (#15513)	2021-01-10 00:32:01 +01:00
redis	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	2020-07-01 19:05:21 +02:00
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-23 01:47:45 +01:00
templates	…
webpacker	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
cli.rb	Deal with collation-related index corruption (#14860)	2020-11-19 17:37:49 +01:00
enumerable.rb	Optimize map { ... }.compact calls (#15513)	2021-01-10 00:32:01 +01:00