Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		2020-08-30 16:13:08 +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-08-30 16:13:08 +02:00
paperclip	Fix thumbnail color extraction (#14464)	2020-08-02 18:47:44 +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