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
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-10 19:09:27 +01:00
admin	Change design of federation pages in admin UI (#17704)	2022-03-09 08:52:32 +01:00
concerns
import	Add Ruby 3.0 support (#16046)	2021-05-06 14:22:54 +02:00
scheduler	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-24 13:59:21 +02:00
web	Prevent use locale with empty string (#18543)	2022-05-28 14:32:08 +02:00
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
cache_buster_worker.rb
delete_mute_worker.rb
digest_mailer_worker.rb
distribution_worker.rb	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
domain_block_worker.rb
domain_clear_media_worker.rb
feed_insert_worker.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-04 01:07:49 +01:00
fetch_reply_worker.rb
import_worker.rb
link_crawl_worker.rb
local_notification_worker.rb	Add notifications when a reblogged status has been updated (#17404)	2022-02-11 22:20:19 +01:00
merge_worker.rb	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
move_worker.rb	Prevent use locale with empty string (#18543)	2022-05-28 14:32:08 +02:00
mute_worker.rb
poll_expiration_notify_worker.rb	Fix duplicate notifications being possible after poll expiration (#17697)	2022-03-04 01:06:33 +01:00
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	Add support for editing for published statuses (#16697)	2022-01-19 22:37:27 +01:00
redownload_avatar_worker.rb	Fix to be able to redownload avatar and header (#16190)	2021-05-11 14:19:22 +02:00
redownload_header_worker.rb	Fix to be able to redownload avatar and header (#16190)	2021-05-11 14:19:22 +02:00
redownload_media_worker.rb	Fix media redownload worker retrying on unexpected response codes (#16111)	2021-05-05 23:46:59 +02:00
refollow_worker.rb
regeneration_worker.rb
remote_account_refresh_worker.rb	Add support for private pinned posts (#16954)	2022-01-17 00:49:55 +01:00
removal_worker.rb
resolve_account_worker.rb
thread_resolve_worker.rb	Fix thread resolve worker retrying when status no longer exists (#16109)	2021-04-26 18:56:45 +02:00
unfavourite_worker.rb
unfollow_follow_worker.rb
unmerge_worker.rb
unpublish_announcement_worker.rb
verify_account_links_worker.rb