mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-24 06:06:49 +00:00
be493b6c0d
Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly. |
||
---|---|---|
.. | ||
.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 | ||
20210616214135_remove_current_sign_in_ip_from_users.rb | ||
20210808071221_clear_orphaned_account_notes.rb | ||
20211126000907_drop_account_identity_proofs.rb | ||
20220109213908_remove_action_taken_from_reports.rb | ||
20220118183010_remove_index_users_on_remember_token.rb | ||
20220118183123_remove_rememberable_from_users.rb | ||
20220202201015_remove_trust_level_from_accounts.rb |