Claire ff73d43b35 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `app/controllers/settings/preferences_controller.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `app/models/user.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `config/i18n-tasks.yml`: Not a real conflict, just a new upstream line too textually close to a glitch-soc-only line. Ported upstream's change.		2022-04-08 19:53:32 +02:00
..
exports	Add import/export feature for bookmarks (#14956)	2020-11-19 17:48:13 +01:00
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
deletes_controller.rb	Fix user email address being banned on self-deletion (#16503)	2021-07-14 05:35:49 +02:00
exports_controller.rb
featured_tags_controller.rb
flavours_controller.rb
imports_controller.rb
login_activities_controller.rb	Fix login date not showing up in login history by using “public” pack	2021-06-23 12:21:40 +02:00
migrations_controller.rb
pictures_controller.rb	Fix profile update not being sent on profile/header picture deletion (#15461)	2020-12-30 23:19:18 +01:00
preferences_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-08 19:53:32 +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