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

Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.

2018-09-11 16:51:26 +02:00

..

activitypub

Add CLI task for rotating keys (#8466)

2018-08-26 20:21:03 +02:00

concerns

Rename ResolveRemoteAccountService to ResolveAccountService (#6327)

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

pubsubhubbub

Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)

2017-07-14 23:01:20 +02:00

account_search_service.rb

Prevent suspended accounts from appearing in AccountSearchService (#7246)

2018-04-23 21:27:18 +02:00

after_block_domain_from_account_service.rb

Get rid of all batch order warnings (#8334)

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

after_block_service.rb

Optimize MuteService and AfterBlockService (#2836)

2017-05-06 16:31:07 +02:00

authorize_follow_service.rb

Use correct activity id in Accept when receiving duplicate Follow (fixes #8218) (#8244)

2018-08-17 14:08:17 +02:00

backup_service.rb

Add bookmarks to archive takeout

2018-08-30 16:29:47 +02:00

base_service.rb

Remove unused AtomBuilderHelper (#1364)

2017-04-11 19:31:22 +02:00

batched_remove_status_service.rb

Improve counter caches on Status and Account (#7644)

2018-05-30 02:50:23 +02:00

block_domain_service.rb

Get rid of all batch order warnings (#8334)

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

block_service.rb

Add handling of Linked Data Signatures in payloads (#4687)

2017-08-26 13:47:38 +02:00

bootstrap_timeline_service.rb

Add autofollow option to invites (#7805)

2018-06-15 18:00:23 +02:00

fan_out_on_write_service.rb

Reduce wasted work in RemoveStatusService due to inactive followers (#7672)

2018-05-29 22:55:33 +02:00

favourite_service.rb

Fix activity:interactions counter to count all interactions (#8037)

2018-07-16 18:35:43 +02:00

fetch_atom_service.rb

Support Actors/Statuses with multiple types (#7305)

2018-05-02 12:40:24 +02:00

fetch_link_card_service.rb

Handle relative URLs when fetching OEmbed/OpenGraph cards (#8669)

2018-09-10 18:26:28 +02:00

fetch_oembed_service.rb

Handle relative URLs when fetching OEmbed/OpenGraph cards (#8669)

2018-09-10 18:26:28 +02:00

fetch_remote_account_service.rb

Improve federated ID validation (#8372)

2018-08-22 20:55:14 +02:00

fetch_remote_status_service.rb

Change conditional to avoid nil into string error in sidekiq (#5987)

2017-12-12 15:11:13 +01:00

follow_service.rb

Bump interactions count when a follow happens (#8468)

2018-08-26 20:02:45 +02:00

mute_service.rb

Keep notification when muting_notifications is true (#7311)

2018-05-02 16:14:51 +02:00

notify_service.rb

Delay e-mail notifications by 2 minutes (#8438)

2018-08-26 16:53:19 +02:00

post_status_service.rb

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

2018-07-17 22:05:25 +02:00

precompute_feed_service.rb

Fix home regeneration (#6251)

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

process_feed_service.rb

Using double splat operator (#5859)

2017-12-06 11:41:57 +01:00

process_hashtags_service.rb

Exclude unlisted, private and direct toots from affecting trends (#7686)

2018-05-31 16:47:28 +02:00

process_interaction_service.rb

Introduce OStatus::TagManager (#5008)

2017-09-19 18:08:08 +02:00

process_mentions_service.rb

Do not process outgoing mentions to suspended accounts (#8272)

2018-08-18 19:42:13 +02:00

reblog_service.rb

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

2018-07-17 22:05:25 +02:00

reject_follow_service.rb

Add handling of Linked Data Signatures in payloads (#4687)

2017-08-26 13:47:38 +02:00

remove_status_service.rb

Get rid of all batch order warnings (#8334)

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

report_service.rb

Add preference for report notification e-mails, skip for duplicates (#8559)

2018-09-02 00:11:58 +02:00

resolve_account_service.rb

Raise Mastodon::RaceConditionError if Redis lock failed (#7511)

2018-05-16 12:29:45 +02:00

resolve_url_service.rb

Allow accessing local private/DM messages by URL (#8196)

2018-08-15 19:33:36 +02:00

search_service.rb

Allow accessing local private/DM messages by URL (#8196)

2018-08-15 19:33:36 +02:00

send_interaction_service.rb

Close http connection in perform method of Request class (#6889)

2018-03-24 12:49:54 +01:00

subscribe_service.rb

Close http connection in perform method of Request class (#6889)

2018-03-24 12:49:54 +01:00

suspend_account_service.rb

Increase reach of Delete->Actor activities (#8305)

2018-08-20 13:28:05 +02:00

unblock_domain_service.rb

Allow domain blocks that only reject media without silencing or suspending (#4325)

2017-07-24 14:26:55 +02:00

unblock_service.rb

Add handling of Linked Data Signatures in payloads (#4687)

2017-08-26 13:47:38 +02:00

unfavourite_service.rb

Add handling of Linked Data Signatures in payloads (#4687)

2017-08-26 13:47:38 +02:00

unfollow_service.rb

Make "unfollow" undo pending outgoing follow request too (#4781)

2017-09-02 20:44:41 +02:00

unmute_service.rb

Fix #231 - Muting

2017-03-02 18:49:32 +01:00

unsubscribe_service.rb

Close http connection in perform method of Request class (#6889)

2018-03-24 12:49:54 +01:00

update_account_service.rb

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

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

update_remote_profile_service.rb

Fix custom emoji handling in UpdateRemoteProfileService (OStatus) (#7501)

2018-05-15 16:03:34 +02:00

verify_salmon_service.rb

Introduce OStatus::TagManager (#5008)

2017-09-19 18:08:08 +02:00