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 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.		1 year ago
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
v2	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
web	Fix embed dropdown menu item for unauthenticated users (#25964)	1 year ago
base_controller.rb	Fix anonymous visitors getting a session cookie on first visit (#24584)	2 years ago
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	5 years ago