mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-24 17:14:15 -05:00
75580360cd
Conflicts: - `.rubocop_todo.yml`: Upstream fixed a bunch lint issues, and changed the `Max` parameter of the `Metrics/AbcSize` cop. Glitch-soc has different code and slightly higher `AbcSize` complexity, modified the `.rubocop_todo.yml` file accordingly. - `app/policies/status_policy.rb`: Upstream changed `account.suspended?` to `account.unavailable?` to prepare for delete flags. Glitch-soc has additional local-only conditions. Ported upstream's refactor while keeping glitch-soc's additional condition. - `app/serializers/initial_state_serializer.rb`: Upstream refactored a bunch of stuff while glitch-soc has more settings. Refactored as upstream did while keeping glitch-soc's settings. |
||
---|---|---|
.. | ||
activitypub | ||
admin | ||
concerns | ||
import | ||
scheduler | ||
web | ||
webhooks | ||
account_deletion_worker.rb | ||
account_merging_worker.rb | ||
account_refresh_worker.rb | ||
add_to_public_statuses_index_worker.rb | ||
after_account_domain_block_worker.rb | ||
after_unallow_domain_worker.rb | ||
authorize_follow_worker.rb | ||
backup_worker.rb | ||
block_worker.rb | ||
bootstrap_timeline_worker.rb | ||
bulk_import_worker.rb | ||
cache_buster_worker.rb | ||
delete_mute_worker.rb | ||
distribution_worker.rb | ||
domain_block_worker.rb | ||
domain_clear_media_worker.rb | ||
feed_insert_worker.rb | ||
fetch_reply_worker.rb | ||
import_worker.rb | ||
link_crawl_worker.rb | ||
local_notification_worker.rb | ||
merge_worker.rb | ||
move_worker.rb | ||
mute_worker.rb | ||
poll_expiration_notify_worker.rb | ||
post_process_media_worker.rb | ||
publish_announcement_reaction_worker.rb | ||
publish_scheduled_announcement_worker.rb | ||
publish_scheduled_status_worker.rb | ||
push_conversation_worker.rb | ||
push_encrypted_message_worker.rb | ||
push_update_worker.rb | ||
redownload_avatar_worker.rb | ||
redownload_header_worker.rb | ||
redownload_media_worker.rb | ||
refollow_worker.rb | ||
regeneration_worker.rb | ||
remote_account_refresh_worker.rb | ||
removal_worker.rb | ||
remove_featured_tag_worker.rb | ||
remove_from_public_statuses_index_worker.rb | ||
resolve_account_worker.rb | ||
tag_unmerge_worker.rb | ||
thread_resolve_worker.rb | ||
trigger_webhook_worker.rb | ||
unfavourite_worker.rb | ||
unfollow_follow_worker.rb | ||
unmerge_worker.rb | ||
unpublish_announcement_worker.rb | ||
verify_account_links_worker.rb |