Claire f9d000ebae Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/services/resolve_url_service.rb`:
  The private toot search by URL hack has been revamped upstream.
  Took upstream's version.

2020-12-19 00:55:12 +01:00

..

assets

…

chewy/strategy

Fix records not being indexed sometimes (#12024)

2019-10-01 01:19:11 +02:00

devise

Fix authentication before 2FA challenge (#11943)

2019-09-24 04:35:36 +02:00

generators

Add post-deployment migration system (#8182)

2018-08-13 18:17:20 +02:00

json_ld

Fix preloaded JSON-LD context for identity not being used (#12138)

2019-10-10 06:48:53 +02:00

mastodon

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

2020-12-19 00:55:12 +01:00

paperclip

Add stoplight for object storage failures, return HTTP 503 (#13043)

2020-12-15 12:55:29 +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-05 17:33:37 +01:00

templates

Add post-deployment migration system (#8182)

2018-08-13 18:17:20 +02:00

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