Claire ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Upstream refactored `visibility` handling to a concern, while glitch-soc had custom code adjacent to some of the changed lines. Applied upstream's changes. - `lib/mastodon/version.rb`: Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's default github repository had been modified. Applied upstream's changes and updated `config/mastodon.yml` accordingly.		2025-01-14 20:38:32 +01:00
..
migrate	Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream	2025-01-14 20:38:32 +01:00
post_migrate	Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream	2024-12-25 18:01:37 +01: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 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream	2025-01-14 20:38:32 +01:00
seeds.rb	Fix `Rails/RootPathnameMethods` cop (#31582)	2024-08-26 07:35:07 +00:00