You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		6 years ago
..
activitypub	Fix poll update handler calling method was that was not available (#10246)	6 years ago
concerns	…
pubsubhubbub	…
account_search_service.rb	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	6 years ago
after_block_domain_from_account_service.rb	…
after_block_service.rb	…
app_sign_up_service.rb	Admission-based registrations mode (#10250)	6 years ago
authorize_follow_service.rb	…
backup_service.rb	…
base_service.rb	…
batched_remove_status_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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)	6 years ago
hashtag_query_service.rb	…
import_service.rb	Add option to overwrite imported data (#9962)	6 years ago
mute_service.rb	…
notify_service.rb	Fix poll update handler calling method was that was not available (#10246)	6 years ago
post_status_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
precompute_feed_service.rb	Fix code style of regeneration-related code (#9843)	6 years ago
process_feed_service.rb	…
process_hashtags_service.rb	Add featured hashtags to profiles (#9755)	6 years ago
process_interaction_service.rb	…
process_mentions_service.rb	…
reblog_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
reject_follow_service.rb	…
remove_status_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
report_service.rb	…
resolve_account_service.rb	…
resolve_url_service.rb	Make sure the poll is created before storing its id (#10142)	6 years ago
search_service.rb	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	6 years ago
send_interaction_service.rb	…
subscribe_service.rb	…
suspend_account_service.rb	Reject existing Follows when suspending a remote account (#10230)	6 years ago
unblock_domain_service.rb	…
unblock_service.rb	…
unfavourite_service.rb	…
unfollow_service.rb	Reject existing Follow in addition to sending a Block (#9811)	6 years ago
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)	6 years ago
verify_salmon_service.rb	…
vote_service.rb	Fix poll update handler calling method was that was not available (#10246)	6 years ago