Thibaut Girka 45deca65b3 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/packs/public.js`:
  Conflict because part of that file has been split to
  `app/javascript/core/settings.js`. Ported those changes
  there.

2020-07-01 19:23:14 +02: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

…

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-06-30 23:00:20 +02:00

paperclip

Fix remote files not using Content-Type header, streaming (#14184)

2020-06-30 23:58:02 +02: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-06-09 10:39:20 +02:00

templates

…

cli.rb

Fix help text around tootctl email_domain_blocks (#14147)

2020-06-26 21:28:40 +02:00