This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.		2022-08-28 11:31:00 +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	…
scheduler	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
web	Prevent use locale with empty string (#18543)	2022-05-28 14:32:08 +02:00
webhooks	Add administrative webhooks (#18510)	2022-06-09 21:57:36 +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	…
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-07-17 22:07:20 +02: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	…
redownload_header_worker.rb	…
redownload_media_worker.rb	…
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	…
trigger_webhook_worker.rb	Add administrative webhooks (#18510)	2022-06-09 21:57:36 +02:00
unfavourite_worker.rb	…
unfollow_follow_worker.rb	…
unmerge_worker.rb	…
unpublish_announcement_worker.rb	…
verify_account_links_worker.rb	…