Claire 993d0a9950 Merge commit '1e3b19230a' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Upstream added new validations close to lines on which glitch-soc had modified validations to handle custom limits set through environment variables. Ported upstream changes. - `config/initializers/content_security_policy.rb`: Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is completely different. Added `AZURE_ALIAS_HOST` to our version of the file.		2023-07-30 13:15:01 +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 Lint/UnusedBlockArguments cop (#26039)	2023-07-20 17:03:39 +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 haml-lint ConsecutiveSilentScripts rule (#26043)	2023-07-18 09:25:37 +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-19 07:35:51 +02:00
profiles	Merge commit '9e245d147b' 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
verifications	Change edit profile page (#25413)	2023-06-14 04:38:07 +02:00