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
..
exports
migration
preferences
two_factor_authentication	Merge branch 'main' into glitch-soc/merge-upstream	2021-08-27 11:29:03 +02:00
aliases_controller.rb
applications_controller.rb
base_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-16 08:30:00 +01:00
deletes_controller.rb	Remove setting that disables account deletes (#17683)	2022-10-06 10:16:47 +02:00
exports_controller.rb	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
featured_tags_controller.rb	Change featured hashtag deletion to be done synchronously (#19590)	2022-10-31 16:31:44 +01:00
flavours_controller.rb
imports_controller.rb
login_activities_controller.rb
migrations_controller.rb
pictures_controller.rb
preferences_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
profiles_controller.rb	Add /api/v1/accounts/familiar_followers to REST API (#17700)	2022-03-07 09:36:47 +01:00
sessions_controller.rb
two_factor_authentication_methods_controller.rb