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.

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	…
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	Avoid race condition when streaming deleted statuses (#10280)	2019-03-16 20:18:47 +01:00
domain_block_worker.rb	…
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	…
local_notification_worker.rb	…
merge_worker.rb	…
mute_worker.rb	…
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	…
push_update_worker.rb	…
refollow_worker.rb	…
regeneration_worker.rb	…
remote_profile_update_worker.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
removal_worker.rb	…
resolve_account_worker.rb	…
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	…
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	…