mastodon/app/services
Thibaut Girka 4aa6aba6ee Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/services/remove_status_service.rb
  Conflict because we still handle the direct timeline.
  Took upstream changes, with that one extra function call.
- config/locales/ca.yml
  Conflict because theme names were updated.
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/oc.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/pl.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
2019-03-16 20:59:33 +01:00
..
activitypub Fix poll update handler calling method was that was not available (#10246) 2019-03-12 22:58:59 +01:00
concerns
pubsubhubbub
account_search_service.rb Add type, limit, offset, min_id, max_id, account_id to search API (#10091) 2019-02-26 15:21:36 +01:00
after_block_domain_from_account_service.rb
after_block_service.rb
app_sign_up_service.rb Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00
authorize_follow_service.rb
backup_service.rb
base_service.rb
batched_remove_status_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-02-26 17:04:44 +01:00
block_domain_service.rb
block_service.rb
bootstrap_timeline_service.rb
fan_out_on_write_service.rb
favourite_service.rb
fetch_atom_service.rb
fetch_link_card_service.rb
fetch_oembed_service.rb
fetch_remote_account_service.rb
fetch_remote_status_service.rb
follow_service.rb Create Redisable#redis (#9633) 2019-02-02 19:11:38 +01:00
hashtag_query_service.rb
import_service.rb Add option to overwrite imported data (#9962) 2019-02-03 03:59:51 +01:00
mute_service.rb
notify_service.rb Fix poll update handler calling method was that was not available (#10246) 2019-03-12 22:58:59 +01:00
post_status_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
precompute_feed_service.rb
process_feed_service.rb
process_hashtags_service.rb Add featured hashtags to profiles (#9755) 2019-02-04 04:25:59 +01:00
process_interaction_service.rb
process_mentions_service.rb
reblog_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
reject_follow_service.rb
remove_status_service.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 20:59:33 +01:00
report_service.rb
resolve_account_service.rb
resolve_url_service.rb Make sure the poll is created before storing its id (#10142) 2019-03-04 00:39:06 +01:00
search_service.rb Add type, limit, offset, min_id, max_id, account_id to search API (#10091) 2019-02-26 15:21:36 +01:00
send_interaction_service.rb
subscribe_service.rb
suspend_account_service.rb Reject existing Follows when suspending a remote account (#10230) 2019-03-10 16:18:58 +01:00
unblock_domain_service.rb
unblock_service.rb
unfavourite_service.rb
unfollow_service.rb
unmute_service.rb
unsubscribe_service.rb
update_account_service.rb
update_remote_profile_service.rb
verify_link_service.rb Rescue SSL error in verify link service (#9914) 2019-01-24 15:38:18 +01:00
verify_salmon_service.rb
vote_service.rb Fix poll update handler calling method was that was not available (#10246) 2019-03-12 22:58:59 +01:00