mirror of https://github.com/tootsuite/mastodon
9b861d56a9
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. |
||
|---|---|---|
| .. | ||
| .gitkeep | ||
| 20180813113448_copy_status_stats_cleanup.rb | ||
| 20180813160548_post_migrate_filters.rb | ||
| 20181116184611_copy_account_stats_cleanup.rb | ||
| 20190511152737_remove_suspended_silenced_account_fields.rb | ||
| 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 | ||
| 20200917222734_remove_index_notifications_on_account_activity.rb | ||
| 20201017234926_fill_account_suspension_origin.rb | ||
| 20210308133107_remove_subscription_expires_at_from_accounts.rb | ||
| 20210502233513_drop_account_tag_stats.rb | ||
| 20210507001928_remove_hub_url_from_accounts.rb | ||
| 20210526193025_remove_lock_version_from_account_stats.rb | ||
| 20210808071221_clear_orphaned_account_notes.rb | ||
| 20211126000907_drop_account_identity_proofs.rb | ||