donphan

Author	SHA1	Message	Date
Claire	b19d4eb43d	Fix HAML linting issues	2023-10-24 20:53:58 +02:00
Claire	c04f2d0cf7	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.	2023-07-17 19:02:23 +02:00
Matt Jankowski	361dd43235	Fix haml-lint Rubocop `lambda` cop (#25946 )	2023-07-17 15:07:29 +02:00
Claire	cb19be67d1	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
Eugen Rochko	7c152acb2c	Change settings area to be separated into categories in admin UI (#19407 ) And update all descriptions	2022-10-22 11:44:41 +02:00