mastodon/app/workers
Claire d77fbbed73 Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests.
2023-05-08 19:28:21 +02:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
admin
concerns
import Rewrite import feature (#21054) 2023-05-02 12:08:48 +02:00
scheduler Fix infinite loop in AccountsStatusesCleanupScheduler (#24840) 2023-05-04 10:13:00 +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
block_worker.rb
bootstrap_timeline_worker.rb
bulk_import_worker.rb Rewrite import feature (#21054) 2023-05-02 12:08:48 +02:00
cache_buster_worker.rb
delete_mute_worker.rb
distribution_worker.rb Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method (#24741) 2023-05-02 18:16:07 +02:00
domain_block_worker.rb
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
fetch_reply_worker.rb
import_worker.rb Rewrite import feature (#21054) 2023-05-02 12:08:48 +02:00
link_crawl_worker.rb
local_notification_worker.rb
merge_worker.rb
move_worker.rb Fix various edge cases with local moves (#24812) 2023-05-03 19:19:25 +02:00
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
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 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
removal_worker.rb
remove_featured_tag_worker.rb
resolve_account_worker.rb
thread_resolve_worker.rb
trigger_webhook_worker.rb
unfavourite_worker.rb
unfollow_follow_worker.rb
unmerge_worker.rb
unpublish_announcement_worker.rb
verify_account_links_worker.rb Fix being able to spoof link verification (#20217) 2022-11-09 08:24:21 +01:00