Claire 4e889e478f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/application.html.haml`: Conflicts due to glitch-soc's theming system. Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code. - `app/views/layouts/embedded.html.haml`: Conflicts due to glitch-soc's theming system. Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.		2023-06-18 16:14:29 +02:00
..
chewy	Change algorithm of tootctl search deploy to improve performance (#18463)	2022-05-22 22:16:43 +02:00
controllers	Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream	2023-06-18 13:41:33 +02:00
helpers	Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream	2023-06-10 15:32:29 +02:00
javascript	[Glitch] Fix non-interactive upload container being given a button role and tabIndex	2023-06-18 14:10:49 +02:00
lib	Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream	2023-06-10 16:48:01 +02:00
mailers	Add unsubscribe link to e-mails (#25378)	2023-06-12 14:22:46 +02:00
models	Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream	2023-06-18 13:41:33 +02:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
presenters	Fix Performance/CollectionLiteralInLoop cop (#24819)	2023-05-04 05:33:55 +02:00
serializers	Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream	2023-06-10 16:22:14 +02:00
services	Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream	2023-06-10 18:42:29 +02:00
validators	Merge commit 'adaa7a61e9c87859251f4ac9be387d3d24c0a962' into glitch-soc/merge-upstream	2023-05-25 23:47:28 +02:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2023-06-18 16:14:29 +02:00
workers	Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream	2023-06-10 16:48:01 +02:00