Claire b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. - `lib/sanitize_ext/sanitize_config.rb`: Upstream renamed a constant that was used slightly differently in glitch-soc. Renamed it as upstream did.		2024-10-06 16:07:58 +02:00
..
migrate	Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream	2024-10-06 16:07:58 +02:00
post_migrate	Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream	2024-09-21 15:06:06 +02:00
seeds	Fix development environment admin account not being auto-approved (#29958)	2024-04-16 17:30:32 +00:00
views	Change follow recommendation materialized view to be faster in most cases (#26545)	2023-08-18 18:20:55 +02:00
schema.rb	Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream	2024-09-21 15:06:06 +02:00
seeds.rb	Fix `Rails/RootPathnameMethods` cop (#31582)	2024-08-26 07:35:07 +00:00