mastodon/app/workers
Claire 12b935fadf Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +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 Fix AccountsStatusesCleanupScheduler not spreading deletes across accounts correctly (#24607) 2023-04-23 22:25:40 +02:00
web Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
webhooks Webhooks for local status.create, status.update, account.update (#24133) 2023-03-19 07:47:54 +01: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 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 Requeue expiration notification (#24311) 2023-03-29 10:52:40 +02:00
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 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
unpublish_announcement_worker.rb
verify_account_links_worker.rb