mastodon/app/workers
Claire 24e83246f9 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/status.rb`:
  Upstream updated media and edit-related code textually close to glitch-soc
  additions (local-only and content-type).
  Ported upstream changes.
- `app/models/status_edit.rb`:
  Upstream changes textually close to glitch-soc additions (content-type).
  Ported upstream changes.
- `app/serializers/activitypub/note_serializer.rb`:
  Upstream changed how media attachments are handled. Not really a conflict,
  but textually close to glitch-soc additions (directMessage attribute).
  Ported upstream changes.
- `app/services/remove_status_service.rb`:
  Upstream changed how media attachments are handled. Not really a conflict,
  but textually close to glitch-soc additions (DM timeline).
  Ported upstream changes.
- `app/services/update_status_service.rb`:
  Upstream fixed an issue with language selection. Not really a conflict,
  but textually close to glitch-soc additions (content-type).
  Ported upstream changes.
- `db/schema.rb`:
  Upstream added columns to the `status_edits` table, the conflict is because
  of an additional column (`content-type`) in glitch-soc.
  Ported upstream changes.
- `package.json`:
  Upstream dependency (express) textually adjacent to a glitch-soc-specific one
  (favico.js) got updated.
  Updated it as well.
2022-03-10 09:52:45 +01: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-03-02 18:02:48 +01:00
web
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 Add support for editing for published statuses (#16697) 2022-01-19 22:37:27 +01: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
move_worker.rb Fix AccountNote not having a maximum length (#16942) 2021-11-06 00:12:25 +01: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
unfavourite_worker.rb
unfollow_follow_worker.rb
unmerge_worker.rb
unpublish_announcement_worker.rb
verify_account_links_worker.rb