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
..
_attachment_list.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
_detailed_status.html.haml	Fix more haml-lint Rubocop (#24107)	2 years ago
_og_description.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
_og_image.html.haml	Fix more haml-lint Rubocop (#24107)	2 years ago
_poll.html.haml	Fix haml-lint Rubocop `Style/MinMaxComparison` cop (#25974)	1 year ago
_simple_status.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
_status.html.haml	Fix more haml-lint Rubocop (#24107)	2 years ago
embed.html.haml	Fix error when trying to render component for media without meta (#16112)	4 years ago
show.html.haml	Fix haml-lint Rubocop `Style/SlicingWithRange` cop (#25947)	1 year ago