178e151019
Conflicts: - `app/models/user_settings.rb`: Upstream added a constraint on a setting textually close to glitch-soc-only settings. Applied upstream's change. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for the `translate` attribute on a few elements, where glitch-soc had a different set of allowed elements and attributes. Extended glitch-soc's allowed attributes with `translate` as upstream did. - `spec/validators/status_length_validator_spec.rb`: Upstream refactored to use RSpec's `instance_double` instead of `double`, but glitch-soc had changes to tests due to configurable max toot chars. Applied upstream's changes while keeping tests against configurable max toot chars. |
||
---|---|---|
.. | ||
activitypub | ||
admin | ||
concerns | ||
import | ||
scheduler | ||
web | ||
webhooks | ||
account_deletion_worker.rb | ||
account_merging_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 | ||
resolve_account_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 |