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
..
challenges_controller.rb	glitch-soc theme engine fixes for the challenges controller	2019-09-30 13:37:13 +02:00
confirmations_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-26 22:49:47 +02:00
omniauth_callbacks_controller.rb	Fix crash when external auth provider has no display_name set (#19962)	2022-11-07 15:43:24 +01:00
passwords_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-06 00:15:38 +01:00
registrations_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-16 08:30:00 +01:00
sessions_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-28 11:11:18 +02:00
setup_controller.rb	Fix new user confirmation page styling	2019-10-01 13:48:47 +02:00