1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-15 15:18:30 +09:00
YuruToot/app/workers
Claire 3ef5f62abf Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream switched to pushing to both DockerHub and GitHub Container
  Repository, while glitch-soc was already pushing to the latter only.
  Updated our configuration to be slightly more consistent with upstream's
  naming and styling, but kept our behavior.
- `Gemfile.lock`:
  Updated dependencies textually too close to glitch-soc only hcaptcha
  dependency.
  Updated dependencies as upstream did.
- `README.md`:
  Upstream updated its README, but we have a completely different one.
  Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
  Minor style fix upstream that's on a line glitch-soc removed because
  of its different theming system.
  Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
  This file apparently did not exist upstream, upstream created it with
  different contents but it is functionally the same.
  Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
  had its own code because it's a fork and does not have the same default
  source URL.
  Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
  Upstream dependencies textually too close to a glitch-soc only one.
  Updated dependencies as upstream did.
2023-03-15 09:16:10 +01:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
admin Change account deletion requests to spread out over time (#20222) 2022-11-09 14:08:19 +01:00
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 Upgrade to latest redis-rb 4.x and fix deprecations (#23616) 2023-03-04 16:38:28 +01:00
web Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
webhooks Add administrative webhooks (#18510) 2022-06-09 21:57:36 +02:00
account_deletion_worker.rb Fix AccountDeletionWorker crashing and clogging sidekiq queues (#15380) 2020-12-20 18:25:00 +01:00
account_merging_worker.rb Fix resolving accounts sometimes creating duplicate records for a given AP id (#15364) 2020-12-18 23:26:26 +01:00
after_account_domain_block_worker.rb Fix domain hiding logic (#7765) 2018-06-09 22:46:54 +02:00
after_unallow_domain_worker.rb Fix removing allowed domains being done synchronously (#14302) 2020-07-15 21:08:19 +02:00
authorize_follow_worker.rb Fix being able to import more than allowed number of follows (#15384) 2020-12-26 23:52:46 +01:00
backup_worker.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
block_worker.rb Add conversations API (#8832) 2018-10-07 23:44:58 +02:00
bootstrap_timeline_worker.rb Default follows for new users (#4871) 2017-09-10 09:58:38 +02:00
cache_buster_worker.rb Add cache buster feature for media files (#15155) 2020-11-19 17:38:06 +01:00
delete_mute_worker.rb Add duration parameter to muting. (#13831) 2020-10-13 01:01:14 +02:00
distribution_worker.rb Refactor how Redis locks are created (#18400) 2022-05-13 00:02:35 +02:00
domain_block_worker.rb Make domain block/silence/reject-media code more robust (#13424) 2020-06-09 10:32:00 +02:00
domain_clear_media_worker.rb Make domain block/silence/reject-media code more robust (#13424) 2020-06-09 10:32:00 +02:00
feed_insert_worker.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
fetch_reply_worker.rb Fix unbounded recursion in post discovery (#23506) 2023-02-10 22:16:37 +01:00
import_worker.rb Add option to overwrite imported data (#9962) 2019-02-03 03:59:51 +01:00
link_crawl_worker.rb Improve error handling on LinkCrawlWorker (#5250) 2017-10-06 20:39:08 +02:00
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 Fix followers count not being updated when migrating follows (#19998) 2022-11-07 15:38:55 +01:00
mute_worker.rb Refactor feed manager (#14761) 2020-09-08 03:41:16 +02:00
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 Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
publish_announcement_reaction_worker.rb Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 2020-07-01 19:05:21 +02:00
publish_scheduled_announcement_worker.rb Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 2020-07-01 19:05:21 +02:00
publish_scheduled_status_worker.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00
push_conversation_worker.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
push_encrypted_message_worker.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
push_update_worker.rb Add caching for payload serialization during fan-out (#19642) 2022-11-04 13:21:06 +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 Add ability to filter followed accounts' posts by language (#19095) 2022-09-20 23:51:21 +02:00
regeneration_worker.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00
remote_account_refresh_worker.rb Add support for private pinned posts (#16954) 2022-01-17 00:49:55 +01:00
removal_worker.rb Add soft delete for statuses for instant deletes through API (#11623) 2019-08-22 21:55:56 +02:00
remove_featured_tag_worker.rb Change featured tag updates to add/remove activity (#19409) 2022-10-22 18:30:55 +02:00
resolve_account_worker.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00
thread_resolve_worker.rb Fix unbounded recursion in post discovery (#23506) 2023-02-10 22:16:37 +01:00
trigger_webhook_worker.rb Add administrative webhooks (#18510) 2022-06-09 21:57:36 +02:00
unfavourite_worker.rb Improve background jobs params and error handling 2017-01-05 03:28:21 +01:00
unfollow_follow_worker.rb Fix original account being unfollowed on migration before the follow request could be sent (#21957) 2023-03-03 21:13:55 +01:00
unmerge_worker.rb Refactor feed manager (#14761) 2020-09-08 03:41:16 +02:00
unpublish_announcement_worker.rb Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 2020-07-01 19:05:21 +02:00
verify_account_links_worker.rb Fix being able to spoof link verification (#20217) 2022-11-09 08:24:21 +01:00