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
..
challenges_controller.rb	glitch-soc theme engine fixes for the challenges controller	5 years ago
confirmations_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
omniauth_callbacks_controller.rb	Fix crash when external auth provider has no display_name set (#19962)	2 years ago
passwords_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
registrations_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
sessions_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
setup_controller.rb	Fix new user confirmation page styling	5 years ago