You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.		4 years ago
..
assets	…
chewy/strategy	Fix unnecessary queries when batch-removing statuses, 100x faster (#15387)	4 years ago
devise	…
generators	…
json_ld	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
paperclip	Add stoplight for object storage failures, return HTTP 503 (#13043)	4 years ago
redis	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	5 years ago
tasks	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
templates	…
webpacker	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
cli.rb	Deal with collation-related index corruption (#14860)	4 years ago