mastodon/app/services
Claire 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/configuration.js`:
  Upstream updated the `js-yaml` dependency, which changed how to call it.
  Those changes conflicted because that code is pretty different in glitch-soc
  which has to deal with its more complex theming system.
  Proceeded to the same compatibility changes in glitch-soc's code.
- `package.json` and `yarn.lock`:
  Not really a conflict, just glitch-soc-specific dependencies textually too
  close to some dependencies updated upstream.
2021-01-06 18:08:06 +01:00
..
activitypub
concerns
keys
account_search_service.rb Fix following restriction not working when exact match in account search (#14394) 2020-07-26 23:58:36 +02:00
after_block_domain_from_account_service.rb
after_block_service.rb Refactor feed manager (#14761) 2020-09-08 03:41:16 +02:00
after_unallow_domain_service.rb
app_sign_up_service.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
authorize_follow_service.rb
backup_service.rb
base_service.rb
batched_remove_status_service.rb
block_domain_service.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01: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
clear_domain_media_service.rb Make domain block/silence/reject-media code more robust (#13424) 2020-06-09 10:32:00 +02:00
delete_account_service.rb
deliver_to_device_service.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
fan_out_on_write_service.rb
favourite_service.rb
fetch_link_card_service.rb
fetch_oembed_service.rb
fetch_remote_status_service.rb
fetch_resource_service.rb
follow_service.rb
import_service.rb
move_service.rb
mute_service.rb
notify_service.rb
post_status_service.rb
precompute_feed_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-08 16:26:47 +02:00
process_hashtags_service.rb
process_mentions_service.rb
reblog_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
reject_follow_service.rb
remove_status_service.rb
report_service.rb
resolve_account_service.rb
resolve_url_service.rb
search_service.rb Fix hashtag search performing account search as well (#13758) 2020-05-14 23:37:37 +02:00
suspend_account_service.rb Fix error when changing ACL on missing objects during suspension (#15420) 2020-12-24 15:53:45 +01:00
tag_search_service.rb Add exclude_unreviewed param to GET /api/v2/search REST API (#11977) 2019-09-28 01:02:21 +02:00
unallow_domain_service.rb Fix removing allowed domains being done synchronously (#14302) 2020-07-15 21:08:19 +02:00
unblock_domain_service.rb
unblock_service.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
unfavourite_service.rb
unfollow_service.rb
unmute_service.rb
unsuspend_account_service.rb
update_account_service.rb
verify_link_service.rb
vote_service.rb