Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.		2023-02-25 14:00:40 +01:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-10 22:49:59 +01:00
admin
concerns	Autofix Rubocop Lint/AmbiguousOperatorPrecedence (#23681)	2023-02-18 04:30:23 +01:00
import	Apply Rubocop Performance/RedundantBlockCall (#23440)	2023-02-08 00:58:18 +01:00
scheduler	Change auto-deletion throttling constants to better scale with server size (#23320)	2023-02-23 16:52:40 +01:00
web	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
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	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
block_worker.rb
bootstrap_timeline_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	Fix unbounded recursion in post discovery (#23506)	2023-02-10 22:16:37 +01:00
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	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
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	Fix unbounded recursion in post discovery (#23506)	2023-02-10 22:16:37 +01:00
trigger_webhook_worker.rb
unfavourite_worker.rb
unfollow_follow_worker.rb
unmerge_worker.rb
unpublish_announcement_worker.rb
verify_account_links_worker.rb