FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/workers
History
Thibaut Girka 980c004f06 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  No real conflict, glitch-soc-only dependency (redcarpet) too close to an
  upstream one (rdf-normalize)
- `README.md`:
  we have different READMEs, discarded upstream's changes
- `app/views/admin/custom_emojis/index.html.haml`:
  No real conflict, different context because of glitch-soc theming
- `lib/mastodon/statuses_cli.rb`:
  Upstream added code to keep bookmarked statuses, we were already doing so
  with slightly different code. Discarded upstream's changes.
- `package.json`:
  No real conflict, glitch-soc-only dependency (favico.js) too close to
  an upstream one
 		2020-01-12 15:57:34 +01:00
..
activitypub Merge branch 'master' into glitch-soc/merge-upstream 2020-01-12 15:57:34 +01:00
admin Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +02:00
concerns
…
import
…
pubsubhubbub Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
scheduler Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00
web Fix web push subscriptions being deleted on rate limit or timeout (#11826) 2019-09-13 19:15:47 +02:00
after_account_domain_block_worker.rb
…
after_remote_follow_request_worker.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
after_remote_follow_worker.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
authorize_follow_worker.rb
…
backup_worker.rb
…
block_worker.rb
…
bootstrap_timeline_worker.rb
…
digest_mailer_worker.rb
…
distribution_worker.rb
…
domain_block_worker.rb Add domain block notes (#11515) 2019-08-07 20:20:23 +02:00
feed_insert_worker.rb Use a redis-cached feed for the DM timeline 2019-06-27 16:44:12 +02:00
fetch_reply_worker.rb
…
import_worker.rb
…
link_crawl_worker.rb
…
local_notification_worker.rb
…
merge_worker.rb
…
move_worker.rb Fix various issues with account migration (#12301) 2019-11-07 09:05:07 +02:00
mute_worker.rb
…
notification_worker.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
poll_expiration_notify_worker.rb
…
processing_worker.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
publish_scheduled_status_worker.rb
…
push_conversation_worker.rb
…
push_update_worker.rb
…
redownload_media_worker.rb Add retry for failed media downloads and `tootctl media refresh` (#11775) 2019-09-10 15:29:12 +02:00
refollow_worker.rb Fix RefollowWorker not keeping show_reblogs setting (#12707) 2020-01-02 20:52:39 +01:00
regeneration_worker.rb
…
remote_profile_update_worker.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +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
…
salmon_worker.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
thread_resolve_worker.rb
…
unfavourite_worker.rb
…
unfollow_follow_worker.rb Fix various issues with account migration (#12301) 2019-11-07 09:05:07 +02:00
unmerge_worker.rb
…
verify_account_links_worker.rb
…