Claire ce12934f5b Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.		2023-04-09 11:45:08 +02:00
..
migrate	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-09 11:45:08 +02:00
post_migrate	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
seeds	Fix situations in which instance actor can be set to a Mastodon-incompatible name (#22307)	2023-01-18 16:33:03 +01:00
views	…
schema.rb	Migrate glitch-soc's exclusive user settings	2023-03-31 22:50:57 +02:00
seeds.rb	Wrap db:setup with Chewy.strategy(:mastodon) (#24302)	2023-03-29 09:58:27 +02:00