Claire 25a46d9e59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/fonts/montserrat.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto-mono.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/models/account.rb`: Textual conflict only caused by glitch-soc using a different value for character limits in a nearby line. Applied upstream's changes. - `app/views/statuses/_simple_status.html.haml`: Attribute added to a tag modified by glitch-soc. Added upstream's attributes. - `yarn.lock`: Upstream added/updated dependencies close to glitch-soc-only ones. Updated/added upstream dependencies.		2022-06-02 09:49:38 +02:00
..
.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
20220303203437_remove_media_attachments_changed_from_status_edits.rb
20220307083603_optimize_null_index_conversations_uri.rb
20220310060545_optimize_null_index_statuses_in_reply_to_account_id.rb
20220310060556_optimize_null_index_statuses_in_reply_to_id.rb
20220310060614_optimize_null_index_media_attachments_scheduled_status_id.rb
20220310060626_optimize_null_index_media_attachments_shortcode.rb
20220310060641_optimize_null_index_users_reset_password_token.rb
20220310060653_optimize_null_index_users_created_by_application_id.rb
20220310060706_optimize_null_index_statuses_uri.rb
20220310060722_optimize_null_index_accounts_moved_to_account_id.rb
20220310060740_optimize_null_index_oauth_access_tokens_refresh_token.rb
20220310060750_optimize_null_index_accounts_url.rb
20220310060809_optimize_null_index_oauth_access_tokens_resource_owner_id.rb
20220310060833_optimize_null_index_announcement_reactions_custom_emoji_id.rb
20220310060854_optimize_null_index_appeals_approved_by_account_id.rb
20220310060913_optimize_null_index_account_migrations_target_account_id.rb
20220310060926_optimize_null_index_appeals_rejected_by_account_id.rb
20220310060939_optimize_null_index_list_accounts_follow_id.rb
20220310060959_optimize_null_index_web_push_subscriptions_access_token_id.rb
20220429101025_remove_ips_from_email_domain_blocks.rb
20220429101850_clear_email_domain_blocks.rb
20220527114923_remove_filtered_languages_from_users.rb	Remove unused filtered_languages column (#18533)	2022-05-27 20:05:22 +02:00