Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml

2019-07-19 18:26:49 +02:00

..

activitypub

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 18:26:49 +02:00

admin

Improve account suspension speed and completeness (#9290)

2018-12-03 01:32:08 +01:00

concerns

Improved remote thread fetching (#10106)

2019-02-28 15:22:21 +01:00

import

Export and import show_reblogs together with following list (#10495)

2019-04-08 07:28:27 +02:00

maintenance

Add periodic removal of older thumbnails for preview cards (#11304)

2019-07-15 07:50:14 +02:00

pubsubhubbub

Remove Salmon and PubSubHubbub (#11205)

2019-07-06 23:26:16 +02:00

scheduler

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 18:26:49 +02:00

web

Change the retry limit in error of web push notification (#11292)

2019-07-15 00:48:50 +02:00

after_account_domain_block_worker.rb

Fix domain hiding logic (#7765)

2018-06-09 22:46:54 +02:00

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

authorize-follow-requests-after-unlocking (#4658)

2017-08-26 12:40:03 +02:00

backup_worker.rb

Log BackupWorker backtrace, delete Backup if retries exhausted (#6769)

2018-03-13 08:15:24 +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

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 default admin UI page reports. Add admin UI for creating a domain block

2017-04-03 18:55:06 +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

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

Optimize the process of following someone (#9220)

2018-11-08 21:05:42 +01:00

merge_worker.rb

Separate background jobs into different queues. ATTENTION: new queue "pull"

2017-04-04 00:53:20 +02:00

mute_worker.rb

Add conversations API (#8832)

2018-10-07 23:44:58 +02:00

notification_worker.rb

Remove Salmon and PubSubHubbub (#11205)

2019-07-06 23:26:16 +02:00

poll_expiration_notify_worker.rb

Fix wrong method used in PollExpirationNotifyWorker (#10265)

2019-03-14 14:04:07 +01:00

processing_worker.rb

Remove Salmon and PubSubHubbub (#11205)

2019-07-06 23:26:16 +02:00

publish_scheduled_status_worker.rb

Fix multiple workers for the same scheduled status being queueable (#9875)

2019-01-20 12:57:05 +01:00

push_conversation_worker.rb

Add conversations API (#8832)

2018-10-07 23:44:58 +02:00

push_update_worker.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

refollow_worker.rb

Get rid of all batch order warnings (#8334)

2018-08-21 12:25:50 +02:00

regeneration_worker.rb

Fix home regeneration (#6251)

2018-01-17 23:56:03 +01:00

remote_profile_update_worker.rb

Remove Salmon and PubSubHubbub (#11205)

2019-07-06 23:26:16 +02:00

removal_worker.rb

Adding some rescues to workers, e.g. don't fail removal job when status can't be found in the first place (already removed)

2016-12-19 09:31:12 +01:00

resolve_account_worker.rb

Rename ResolveRemoteAccountService to ResolveAccountService (#6327)

2018-01-22 14:25:09 +01:00

salmon_worker.rb

Remove Salmon and PubSubHubbub (#11205)

2019-07-06 23:26:16 +02:00

thread_resolve_worker.rb

Improved remote thread fetching (#10106)

2019-02-28 15:22:21 +01:00

unfavourite_worker.rb

Improve background jobs params and error handling

2017-01-05 03:28:21 +01:00

unfollow_follow_worker.rb

Follow new account before unfollowing the old one during move (#9719)

2019-01-05 11:27:58 +01:00

unmerge_worker.rb

Separate background jobs into different queues. ATTENTION: new queue "pull"

2017-04-04 00:53:20 +02:00

verify_account_links_worker.rb

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00