Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/media_attachment.rb

2019-05-04 16:37:26 +02:00

..

activitypub

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

2019-05-04 16:37:26 +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

…

pubsubhubbub

…

scheduler

Create Redisable#redis (#9633)

2019-02-02 19:11:38 +01:00

web

Do no retry web push workers if the server returns a 4xx response (#9434)

2018-12-17 03:14:13 +01:00

after_account_domain_block_worker.rb

…

after_remote_follow_request_worker.rb

…

after_remote_follow_worker.rb

…

authorize_follow_worker.rb

…

backup_worker.rb

…

block_worker.rb

Add conversations API (#8832)

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

bootstrap_timeline_worker.rb

…

digest_mailer_worker.rb

…

distribution_worker.rb

Avoid race condition when streaming deleted statuses (#10280)

2019-03-16 20:18:47 +01:00

domain_block_worker.rb

…

feed_insert_worker.rb

…

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

…

local_notification_worker.rb

Optimize the process of following someone (#9220)

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

merge_worker.rb

…

mute_worker.rb

Add conversations API (#8832)

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

notification_worker.rb

…

poll_expiration_notify_worker.rb

Fix wrong method used in PollExpirationNotifyWorker (#10265)

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

processing_worker.rb

…

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

…

refollow_worker.rb

…

regeneration_worker.rb

…

remote_profile_update_worker.rb

…

removal_worker.rb

…

resolve_account_worker.rb

…

salmon_worker.rb

…

thread_resolve_worker.rb

Improved remote thread fetching (#10106)

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

unfavourite_worker.rb

…

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

…

verify_account_links_worker.rb

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

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