Claire c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/settings/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc had a different lambda due to its theming system. Applied the same code style changes. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc removed some code just after the lambda. Applied the same code style changes.		2023-07-17 19:02:23 +02:00
..
aliases	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
applications	Fix haml-lint Rubocop lambda cop (#25946)	2023-07-17 15:07:29 +02:00
deletes	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
exports	Change user backups to use expiring URLs for download when possible (#24136)	2023-03-16 22:46:52 +01:00
featured_tags	Change edit profile page (#25413)	2023-06-14 04:38:07 +02:00
flavours	Fix glitch-soc HAML linting issues (#2166)	2023-04-07 20:55:28 +02:00
imports	Fix haml-lint Rubocop Style/StringLiterals cop (#25948)	2023-07-17 16:57:18 +02:00
login_activities	Fix typo in _login_activity.html.haml (#24263)	2023-03-26 10:59:14 +02:00
migration/redirects	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
migrations	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
preferences	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-17 19:02:23 +02:00
profiles	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	2023-06-18 13:41:33 +02:00
shared	Change edit profile page (#25413)	2023-06-14 04:38:07 +02:00
two_factor_authentication	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
two_factor_authentication_methods	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
verifications	Change edit profile page (#25413)	2023-06-14 04:38:07 +02:00