Thibaut Girka 99fc46d023 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.		2020-03-22 16:10:44 +01: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-03-08 19:38:53 +01:00
paperclip	Fix videos with unsupported colorspace not being transcoded (#13242)	2020-03-10 11:58:40 +01:00
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-29 12:20:54 +01:00
templates	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
cli.rb	Close registration before self-destruct (#12877)	2020-01-21 18:56:18 +01:00