Claire 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.		2023-12-20 22:16:50 +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 Style/HashEachMethods cop in HAML files (#28178)	2023-12-04 09:09:43 +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	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	Fix HAML linting issues	2023-10-24 20:53:58 +02:00
privacy	Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream	2023-09-02 11:41:40 +02:00
profiles	Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream	2023-12-20 22:05:31 +01:00
shared	Add privacy tab in profile settings (#26484)	2023-08-14 18:52:45 +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	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