Claire 016d194274 Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, upstream added helpers right next to glitch-soc only helpers. Added upstream's helpers. - `spec/models/status_spec.rb`: Not a real conflict, upstream added specs right next to glitch-soc only specs. Added upstream's tests.		2024-05-06 17:53:51 +02:00
..
migrate	Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream	2024-05-06 17:53:51 +02:00
post_migrate	Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream	2024-05-04 16:28:30 +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 '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream	2024-05-06 17:53:51 +02:00
seeds.rb	Drop EOL Ruby 2.7 (#24237)	2023-04-27 01:46:18 +02:00