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
..
exports	Add import/export feature for bookmarks (#14956)	4 years ago
migration	Refactor settings controllers (#14767)	4 years ago
preferences	Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)	5 years ago
two_factor_authentication	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
aliases_controller.rb	Refactor settings controllers (#14767)	4 years ago
applications_controller.rb	Refactor settings controllers (#14767)	4 years ago
base_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
deletes_controller.rb	Remove setting that disables account deletes (#17683)	2 years ago
exports_controller.rb	Refactor how Redis locks are created (#18400)	2 years ago
featured_tags_controller.rb	Change featured hashtag deletion to be done synchronously (#19590)	2 years ago
flavours_controller.rb	Revert some refactoring in order to make codebase closer to upstream	5 years ago
imports_controller.rb	Refactor settings controllers (#14767)	4 years ago
login_activities_controller.rb	Fix login date not showing up in login history by using “public” pack	3 years ago
migrations_controller.rb	Refactor settings controllers (#14767)	4 years ago
pictures_controller.rb	Fix profile update not being sent on profile/header picture deletion (#15461)	3 years ago
preferences_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
profiles_controller.rb	Add `/api/v1/accounts/familiar_followers` to REST API (#17700)	2 years ago
sessions_controller.rb	Refactor settings controllers (#14767)	4 years ago
two_factor_authentication_methods_controller.rb	Refactor settings controllers (#14767)	4 years ago