Thibaut Girka f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.		2020-04-02 20:32:00 +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-04-02 20:32:00 +02:00
paperclip	Fix Paperclip using deprecated URI.escape function (#13320)	2020-03-26 15:09:16 +01:00
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-29 12:20:54 +01:00
templates
cli.rb	Close registration before self-destruct (#12877)	2020-01-21 18:56:18 +01:00