Claire 656a41db2a Merge commit '77098c6f1c' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated its README, we have a completely different one. Kept ours. - `app/views/auth/sessions/two_factor.html.haml`: Upstream refactored stuff and the conflict is because of glitch-soc's theming system. Ported upstream changes while accounting for the different theming system.		2023-10-17 20:59:18 +02:00
..
challenges	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
confirmations	Fix CAPTCHA page not following design pattern of sign-up flow (#25395)	2023-06-13 22:30:40 +02:00
passwords	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
registrations	Fix haml-lint InstanceVariables rule for auth/registrations/status (#27341)	2023-10-11 16:20:26 +02:00
sessions	Merge commit '77098c6f1c' into glitch-soc/merge-upstream	2023-10-17 20:59:18 +02:00
setup	Merge commit '3a4d3e9d4b' into glitch-soc/merge-upstream	2023-08-12 09:36:38 +02:00
shared	Add progress indicator to sign-up flow (#24545)	2023-04-16 07:01:24 +02:00