mirror of
https://github.com/funamitech/mastodon
synced 2024-12-11 13:19:01 +09:00
1901829f9a
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. |
||
|---|---|---|
| .. | ||
| exports | ||
| migration | ||
| preferences | ||
| two_factor_authentication | ||
| aliases_controller.rb | ||
| applications_controller.rb | ||
| base_controller.rb | ||
| deletes_controller.rb | ||
| exports_controller.rb | ||
| featured_tags_controller.rb | ||
| flavours_controller.rb | ||
| imports_controller.rb | ||
| login_activities_controller.rb | ||
| migrations_controller.rb | ||
| pictures_controller.rb | ||
| preferences_controller.rb | ||
| profiles_controller.rb | ||
| sessions_controller.rb | ||
| two_factor_authentication_methods_controller.rb | ||