mastodon/app/services
Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.
2021-11-26 22:53:55 +01:00
..
activitypub Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
concerns
keys
account_search_service.rb
account_statuses_cleanup_service.rb Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
after_block_domain_from_account_service.rb
after_block_service.rb
after_unallow_domain_service.rb
app_sign_up_service.rb
authorize_follow_service.rb
backup_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-07-25 12:48:48 +02:00
base_service.rb
batched_remove_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-11-19 18:51:41 +01:00
block_domain_service.rb
block_service.rb
bootstrap_timeline_service.rb
clear_domain_media_service.rb
delete_account_service.rb Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
deliver_to_device_service.rb
fan_out_on_write_service.rb
favourite_service.rb
fetch_link_card_service.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
fetch_oembed_service.rb Fix some link previews being incorrectly generated from other prior links (#16885) 2021-10-21 20:39:35 +02:00
fetch_remote_status_service.rb
fetch_resource_service.rb
follow_service.rb
import_service.rb
move_service.rb
mute_service.rb
notify_service.rb Fix filtering DMs from non-followed users (#17042) 2021-11-25 23:46:30 +01:00
post_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
precompute_feed_service.rb
process_hashtags_service.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
process_mentions_service.rb
reblog_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
reject_follow_service.rb
remove_from_followers_service.rb Add remove from followers api (#16864) 2021-10-18 12:02:35 +02:00
remove_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-07-25 12:48:48 +02:00
report_service.rb
resolve_account_service.rb Fix remotely-suspended accounts' toots being merged back into timelines (#16628) 2021-08-20 07:40:33 +01:00
resolve_url_service.rb
search_service.rb
suspend_account_service.rb
tag_search_service.rb
unallow_domain_service.rb
unblock_domain_service.rb
unblock_service.rb
unfavourite_service.rb
unfollow_service.rb
unmute_service.rb
unsuspend_account_service.rb Fix remotely-suspended accounts' toots being merged back into timelines (#16628) 2021-08-20 07:40:33 +01:00
update_account_service.rb
verify_link_service.rb
vote_service.rb