Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.		2022-11-06 09:50:41 +01:00
..
exports	Add import/export feature for bookmarks (#14956)	2020-11-19 17:48:13 +01:00
migration	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
preferences	Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)	2019-06-07 16:51:08 +02:00
two_factor_authentication	Merge branch 'main' into glitch-soc/merge-upstream	2021-08-27 11:29:03 +02:00
aliases_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
applications_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-28 14:13:30 +02: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	Revert some refactoring in order to make codebase closer to upstream	2019-07-23 10:51:12 +02:00
imports_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
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	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
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-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	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
two_factor_authentication_methods_controller.rb	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00