You can not 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 cb70bb8665 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.		1 year ago
..
aliases	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	3 years ago
applications	Fix haml-lint Rubocop `lambda` cop (#25946)	1 year ago
deletes	Fix style for hashes (#20518)	2 years ago
exports	Change user backups to use expiring URLs for download when possible (#24136)	2 years ago
featured_tags	Change edit profile page (#25413)	1 year ago
flavours	Fix glitch-soc HAML linting issues (#2166)	2 years ago
imports	Fix haml-lint Rubocop `Style/StringLiterals` cop (#25948)	1 year ago
login_activities	Fix typo in _login_activity.html.haml (#24263)	2 years ago
migration/redirects	Fix style for hashes (#20518)	2 years ago
migrations	Fix style for hashes (#20518)	2 years ago
preferences	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
profiles	Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream	1 year ago
shared	Change edit profile page (#25413)	1 year ago
two_factor_authentication	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
two_factor_authentication_methods	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago
verifications	Change edit profile page (#25413)	1 year ago