mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-11 20:57:44 +00:00
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. |
||
---|---|---|
.. | ||
active_record | ||
assets | ||
chewy/strategy | ||
devise | ||
generators | ||
json_ld | ||
mastodon | ||
paperclip | ||
rails | ||
redis | ||
sanitize_ext | ||
simple_navigation | ||
tasks | ||
templates | ||
terrapin | ||
webpacker | ||
cli.rb | ||
enumerable.rb | ||
exceptions.rb |