You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire ec5783c59c Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.		4 years ago
..
assets	Add emoji autosuggest (#5053)	7 years ago
chewy/strategy	Fix records not being indexed sometimes (#12024)	5 years ago
devise	Fix authentication before 2FA challenge (#11943)	5 years ago
generators	Add post-deployment migration system (#8182)	6 years ago
json_ld	Fix preloaded JSON-LD context for identity not being used (#12138)	5 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
paperclip	Fix downloading remote media files when server returns empty filename (#14867)	4 years ago
redis	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	4 years ago
tasks	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
templates	Add post-deployment migration system (#8182)	6 years ago
webpacker	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
cli.rb	Deal with collation-related index corruption (#14860)	4 years ago