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
..
.gitkeep	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
20180813113448_copy_status_stats_cleanup.rb
20180813160548_post_migrate_filters.rb	Split custom filter migration script using the post-deployment migration system	2018-08-16 20:30:09 +02:00
20181116184611_copy_account_stats_cleanup.rb
20190511152737_remove_suspended_silenced_account_fields.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00
20190519130537_remove_boosts_widening_audience.rb
20190706233204_drop_stream_entries.rb
20190715031050_drop_subscriptions.rb
20190901040524_remove_score_from_tags.rb
20190927124642_remove_invalid_web_push_subscription.rb
20200917193528_migrate_notifications_type.rb	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
20200917222734_remove_index_notifications_on_account_activity.rb	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
20201017234926_fill_account_suspension_origin.rb	Add support for reversible suspensions through ActivityPub (#14989)	2020-11-08 00:28:39 +01:00
20210308133107_remove_subscription_expires_at_from_accounts.rb	Remove subscription_expires_at leftover from OStatus (#15857)	2021-03-12 05:25:24 +01:00
20210502233513_drop_account_tag_stats.rb	Change trending hashtags to be affected be reblogs (#16164)	2021-05-07 14:33:43 +02:00
20210507001928_remove_hub_url_from_accounts.rb	Remove PubSubHubbub-related columns from accounts table (#16170)	2021-05-07 19:32:58 +02:00
20210526193025_remove_lock_version_from_account_stats.rb	Fix account deletion sometimes failing because of optimistic locks (#16317)	2021-06-02 17:41:25 +02:00
20210808071221_clear_orphaned_account_notes.rb	Fix owned account notes not being deleted when an account is deleted (#16579)	2021-08-08 15:29:57 +02:00
20211126000907_drop_account_identity_proofs.rb	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00