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
..
chewy	Change account search to match by text when opted-in (#25599)	1 year ago
controllers	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
helpers	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
javascript	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
mailers	Refactor `NotificationMailer` to use parameterization (#25718)	1 year ago
models	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
policies	Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream	1 year ago
presenters	Fix Performance/CollectionLiteralInLoop cop (#24819)	2 years ago
serializers	Merge commit '789459cea386e47870d457aa79a221392930095d' into glitch-soc/merge-upstream	1 year ago
services	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
validators	Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream	1 year ago
views	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
workers	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago