Claire c59fb65ddc Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to glitch-soc's option to hide followers count. Ported upstream changes. Additional changes: - `app/views/application/mailer/_account.html.haml`: Ported glitch-soc's option to hide followers count. - `app/views/settings/flavours/show.html.haml`: Ported the `frontend_asset_url` helper change to glitch-soc.		2024-01-17 18:32:15 +01: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 LineLength haml-lint in app/views/settings area (#28663)	2024-01-09 15:28:56 +00:00
deletes	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
exports	Issue 26048: swap "muting" and "blocking" list options in settings -> Data Exports (#26088)	2023-10-26 14:08:25 +00:00
featured_tags	Clean up settings/featured_tags/index view (#28688)	2024-01-11 10:45:26 +00:00
flavours	Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream	2024-01-17 18:32:15 +01:00
imports	Fix LineLength haml-lint in app/views/settings area (#28663)	2024-01-09 15:28:56 +00:00
login_activities	Refactor login activity partial (remove inline ruby) (#28687)	2024-01-11 10:36:27 +00:00
migration/redirects	Fix LineLength haml-lint in app/views/settings area (#28663)	2024-01-09 15:28:56 +00:00
migrations	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
preferences	Fix lint issue in glitch-soc-only setting form	2024-01-11 13:22:39 +01:00
privacy	Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream	2023-09-02 11:41:40 +02:00
profiles	Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream	2024-01-11 13:17:13 +01:00
shared	Add privacy tab in profile settings (#26484)	2023-08-14 18:52:45 +02:00
two_factor_authentication	Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream	2024-01-11 13:17:13 +01:00
two_factor_authentication_methods	Fix haml-lint UnnecessaryStringOutput for views (#27531)	2023-10-25 12:01:00 +00:00
verifications	Change edit profile page (#25413)	2023-06-14 04:38:07 +02:00