mastodon/app/services
Claire 2d4b4b0b45 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream introduced support for private pinned toots, but glitch-soc's query
  was a bit different as it filtered out local-only toots.
  Used upstream's query, while adding local-only filtering back.
- `app/controllers/activitypub/collections_controller.rb`:
  Same thing with regards to local-only posts.
- `app/validators/status_pin_validator.rb`:
  Not a real conflict, but the line below was different in glitch-soc due to
  the configurable pinned toots limit.
2022-01-17 08:28:52 +01:00
..
activitypub Add support for private pinned posts (#16954) 2022-01-17 00:49:55 +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 Fix blocking someone not clearing up list feeds (#16205) 2021-05-10 17:31:55 +02:00
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 Change auto-following admin-selected accounts, show in recommendations (#16078) 2021-04-24 17:01:43 +02:00
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 Fix empty home feed before first follow has finished processing (#16152) 2021-05-04 04:45:08 +02:00
import_service.rb Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
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 Merge branch 'main' into glitch-soc/merge-upstream 2021-04-20 12:17:14 +02:00
purge_domain_service.rb Remove custom emojis on domain purge (#17210) 2021-12-30 08:41:09 +01:00
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 Fix reports of already suspended accounts being recorded (#16047) 2021-04-16 22:01:05 +02:00
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 Fix remote reporters not receiving suspend/unsuspend activities (#16050) 2021-04-17 14:55:46 +02:00
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