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

Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
  Not a “real” conflict, but change too close to a change we made to
  fix the vanilla WebUI locally pushing authored local-only toots in the
  public TL view.

2020-07-22 13:38:17 +02:00

..

assets

Add emoji autosuggest (#5053)

2017-09-23 14:47:32 +02:00

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-07-16 14:43:50 +02:00

paperclip

Fix mimetype returning nil (#14356)

2020-07-19 13:09:47 +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

Add post-deployment migration system (#8182)

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

cli.rb

Fix help text around tootctl email_domain_blocks (#14147)

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