Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb

2019-07-23 10:51:07 +02:00

..

activitypub

Refactor fetching of remote resources (#11251)

2019-07-10 18:59:28 +02:00

concerns

Disable LDSigning when AUTHORIZED_FETCH is set to true (#11295)

2019-07-15 02:29:39 +02:00

account_search_service.rb

…

after_block_domain_from_account_service.rb

Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966)

2019-06-04 23:11:18 +02:00

after_block_service.rb

…

app_sign_up_service.rb

…

authorize_follow_service.rb

Remove Salmon and PubSubHubbub (#11205)

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

backup_service.rb

Fix BackupService crashing when an attachment is missing (#11241)

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

base_service.rb

…

batched_remove_status_service.rb

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

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

block_domain_service.rb

Remove Salmon and PubSubHubbub (#11205)

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

block_service.rb

Fix BlockService trying to reject incorrect follow request (#11288)

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

bootstrap_timeline_service.rb

…

fan_out_on_write_service.rb

Use a redis-cached feed for the DM timeline

2019-06-27 16:44:12 +02:00

favourite_service.rb

Remove Salmon and PubSubHubbub (#11205)

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

fetch_link_card_service.rb

Refactor fetching of remote resources (#11251)

2019-07-10 18:59:28 +02:00

fetch_oembed_service.rb

…

fetch_remote_account_service.rb

Refactor fetching of remote resources (#11251)

2019-07-10 18:59:28 +02:00

fetch_remote_status_service.rb

Refactor fetching of remote resources (#11251)

2019-07-10 18:59:28 +02:00

fetch_resource_service.rb

Add HTTP signatures to all outgoing ActivityPub GET requests (#11284)

2019-07-11 14:49:55 +02:00

follow_service.rb

Remove Salmon and PubSubHubbub (#11205)

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

hashtag_query_service.rb

…

import_service.rb

…

mute_service.rb

…

notify_service.rb

…

post_status_service.rb

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

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

precompute_feed_service.rb

Use a redis-cached feed for the DM timeline

2019-06-27 16:44:12 +02:00

process_hashtags_service.rb

Refactor controllers for statuses, accounts, and more (#11249)

2019-07-08 12:03:45 +02:00

process_mentions_service.rb

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

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

reblog_service.rb

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

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

reject_follow_service.rb

Remove Salmon and PubSubHubbub (#11205)

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

remove_status_service.rb

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

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

report_service.rb

Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966)

2019-06-04 23:11:18 +02:00

resolve_account_service.rb

Fix handling of webfinger redirects in ResolveAccountService (#11279)

2019-07-10 17:10:12 +02:00

resolve_url_service.rb

Fix leaking private statuses the admin account follows (#11300)

2019-07-15 02:29:04 +02:00

search_service.rb

…

suspend_account_service.rb

Remove WebSub subscriptions (#11303)

2019-07-21 04:08:00 +02:00

unblock_domain_service.rb

Change domain blocks to automatically support subdomains (#11138)

2019-06-22 00:13:10 +02:00

unblock_service.rb

Remove Salmon and PubSubHubbub (#11205)

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

unfavourite_service.rb

Remove Salmon and PubSubHubbub (#11205)

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

unfollow_service.rb

Remove Salmon and PubSubHubbub (#11205)

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

unmute_service.rb

…

update_account_service.rb

…

verify_link_service.rb

…

vote_service.rb

Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966)

2019-06-04 23:11:18 +02:00