monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/workers
History
Thibaut Girka ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, we deleted it to not be flooded by Depandabot.
  Kept deleted.
- `Gemfile.lock`:
  Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
  Upstream updated the serializer to support timed mutes, while
  glitch-soc added a custom API ages ago to get information that
  is already available elsewhere.
  Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
  🤷
- `app/models/user.rb`:
  New user setting added upstream while we have glitch-soc-specific
  user settings. Added upstream's user setting.
- `config/settings.yml`:
  Upstream added a new user setting close to a user setting we had
  changed the defaults for. Added the new upstream setting.
- `package.json`:
  Upstream dependency updated “too close” to a glitch-soc-specific
  dependency. No real conflict. Updated the dependency.
 		2020-10-21 19:10:50 +02:00
..
activitypub Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
admin Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
concerns Improved remote thread fetching (#10106) 2019-02-28 15:22:21 +01:00
import Fix performance of follow import (#13836) 2020-06-09 10:26:58 +02:00
scheduler Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
web Fix web push subscriptions being deleted on rate limit or timeout (#11826) 2019-09-13 19:15:47 +02:00
account_deletion_worker.rb Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02: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 authorize-follow-requests-after-unlocking (#4658) 2017-08-26 12:40:03 +02: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 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
delete_mute_worker.rb Add duration parameter to muting. (#13831) 2020-10-13 01:01:14 +02:00
digest_mailer_worker.rb Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252) 2018-01-15 04:34:28 +01:00
distribution_worker.rb Avoid race condition when streaming deleted statuses (#10280) 2019-03-16 20:18:47 +01: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 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
fetch_reply_worker.rb Improved remote thread fetching (#10106) 2019-02-28 15:22:21 +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 option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02:00
merge_worker.rb Refactor feed manager (#14761) 2020-09-08 03:41:16 +02:00
move_worker.rb Change move handler to carry blocks over (#14144) 2020-07-01 13:51:15 +02:00
mute_worker.rb Refactor feed manager (#14761) 2020-09-08 03:41:16 +02:00
poll_expiration_notify_worker.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02: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 Lists (#5703) 2017-11-18 00:16:48 +01:00
redownload_media_worker.rb Add customizable thumbnails for audio and video attachments (#14145) 2020-06-29 13:56:55 +02:00
refollow_worker.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +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
removal_worker.rb Add soft delete for statuses for instant deletes through API (#11623) 2019-08-22 21:55:56 +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 Improved remote thread fetching (#10106) 2019-02-28 15:22:21 +01:00
unfavourite_worker.rb
…
unfollow_follow_worker.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +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