You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire cb70bb8665 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.		1 year ago
..
statuses	Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)	2 years ago
_filter.html.haml	Add ability to filter individual posts (#18945)	2 years ago
_filter_fields.html.haml	Fix haml-lint Rubocop `lambda` cop (#25946)	1 year ago
_keyword_fields.html.haml	Revamp post filtering system (#18058)	2 years ago
edit.html.haml	Revamp post filtering system (#18058)	2 years ago
index.html.haml	Setup haml-lint CI with todo config (#23524)	2 years ago
new.html.haml	Revamp post filtering system (#18058)	2 years ago