alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/workers
History
Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/home_controller.rb`:
  Upstream made it so `/web` is available to non-logged-in users
  and `/` redirects to `/web` instead of `/about`.
  Kept our version since glitch-soc's WebUI doesn't have what's
  needed yet and I think /about is still a much better landing
  page anyway.
- `app/models/form/admin_settings.rb`:
  Upstream added new settings, and glitch-soc had an extra setting.
  Not really a conflict.
  Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a new `server` initial state object.
  Not really a conflict.
  Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
  Upstream added new settings.
  Not really a conflict.
  Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Upstream refactored that part and removed the file.
  Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
  Upstream added new settings.
  Not a real conflict.
  Added upstream's new settings.
 		2022-10-02 18:46:22 +02:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
admin Change design of federation pages in admin UI (#17704) 2022-03-09 08:52:32 +01:00
concerns
…
import Add Ruby 3.0 support (#16046) 2021-05-06 14:22:54 +02:00
scheduler Add retention policy for cached content and media (#19232) 2022-09-27 03:08:19 +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 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
…
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 Change local media attachments to perform heavy processing asynchronously (#13210) 2020-03-08 23:56:18 +01:00
block_worker.rb
…
bootstrap_timeline_worker.rb
…
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
…
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 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 Add color extraction for audio thumbnails (#14209) 2020-07-05 18:28:25 +02: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 support for editing for published statuses (#16697) 2022-01-19 22:37:27 +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
…
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 thread resolve worker retrying when status no longer exists (#16109) 2021-04-26 18:56:45 +02:00
trigger_webhook_worker.rb Add administrative webhooks (#18510) 2022-06-09 21:57:36 +02:00
unfavourite_worker.rb
…
unfollow_follow_worker.rb Add ability to filter followed accounts' posts by language (#19095) 2022-09-20 23:51:21 +02: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 background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00