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.		2022-11-16 08:30:00 +01:00
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
v2	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
web	Refactor formatter (#17828)	2022-03-26 02:53:34 +01:00
base_controller.rb	Add 'private' to Cache-Control, match Rails expectations (#20608)	2022-11-16 04:56:30 +01:00
oembed_controller.rb