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 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)		2019-09-13 18:13:43 +02:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
admin	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
concerns	…
import	Export and import show_reblogs together with following list (#10495)	2019-04-08 07:28:27 +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-09-05 11:36:41 +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	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	…
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	…
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	…
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	…
unmerge_worker.rb	…
verify_account_links_worker.rb	…