Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.		2021-11-26 22:53:55 +01:00
..
migrate	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-25 23:50:35 +01:00
post_migrate	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
views	Improve performance of follow recommendation scheduler (#16159)	2021-05-05 22:04:52 +02:00
schema.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
seeds.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00