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	…
generators	…
json_ld	…
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	…
redis	…
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	…
terrapin	Add Ruby 3.0 support (#16046)	3 years ago
webpacker	…
cli.rb	Add ability for admins to delete canonical email blocks (#16644)	2 years ago
enumerable.rb	…
exceptions.rb	Fix error when passing unknown filter param in REST API (#20626)	2 years ago