You cannot 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 1901829f9a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Our config file is pretty different from upstream. Upstream changed CSP directive `script-src` to include `wasm-unsafe-eval` instead of `unsafe-eval`, which we did not include. Added `wasm-unsafe-eval` to `script-src` to fix execution of the OCR web worker. - `package.json`: Upstream updated a dependency (`array-includes`) textually adjacent to a glitch-soc-only dependency (`atrament`). Updated `array-includes` as upstream did.		2 years ago
..
active_record	Remove dependency on pluck_each gem (#16012)	3 years ago
assets	png optimization(loss less) (#19630)	2 years ago
chewy/strategy	Change search indexing to use batches to minimize resource usage (#18451)	2 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)	3 years ago
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
paperclip	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
rails	Fix obsolete digitalocean.rake file breaking rake tasks (#15618)	3 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	2 years ago
simple_navigation	Add customizable user roles (#18641)	2 years ago
tasks	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
templates	Add post-deployment migration system (#8182)	6 years ago
terrapin	Add Ruby 3.0 support (#16046)	3 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)	2 years ago
enumerable.rb	Optimize map { ... }.compact calls (#15513)	3 years ago
exceptions.rb	Fix error when passing unknown filter param in REST API (#20626)	2 years ago