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 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.		3 years ago
..
active_record	Remove dependency on pluck_each gem (#16012)	4 years ago
assets	Add emoji autosuggest (#5053)	7 years ago
chewy/strategy	Fix unnecessary queries when batch-removing statuses, 100x faster (#15387)	4 years ago
devise	Fix authentication before 2FA challenge (#11943)	5 years ago
generators	Add post-deployment migration system (#8182)	6 years ago
json_ld	Fixed code quality issues (#15541)	4 years ago
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
paperclip	fix: `s3_force_single_request` not parsed (#17922)	3 years ago
rails	Fix obsolete digitalocean.rake file breaking rake tasks (#15618)	4 years ago
redis	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	4 years ago
sanitize_ext	Fix link sanitization for outgoing text/html and text/markdown toots	3 years ago
tasks	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
templates	Add post-deployment migration system (#8182)	6 years ago
terrapin	Add Ruby 3.0 support (#16046)	4 years ago
webpacker	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
cli.rb	Add ability for admins to delete canonical email blocks (#16644)	3 years ago
enumerable.rb	Optimize map { ... }.compact calls (#15513)	4 years ago
exceptions.rb	Fix error resposes for `from` search prefix (#17963)	3 years ago