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 f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.		5 years ago
..
activitypub	Add federation support for the "hide network" preference (#11673)	5 years ago
concerns	…
account_search_service.rb	Fix error when searching for URLs that contain the mention syntax (#13151)	5 years ago
after_block_domain_from_account_service.rb	…
after_block_service.rb	…
app_sign_up_service.rb	Add `reason` param to `POST /api/v1/accounts` REST API (#12064)	5 years ago
authorize_follow_service.rb	…
backup_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
base_service.rb	…
batched_remove_status_service.rb	…
block_domain_service.rb	Change domain block behavior to update user records before deleting data (#12247)	5 years ago
block_service.rb	…
bootstrap_timeline_service.rb	Admin setting to disable default follows (#12566)	5 years ago
fan_out_on_write_service.rb	…
favourite_service.rb	…
fetch_link_card_service.rb	Fix link crawler not specifying accepted content-type (#12646)	5 years ago
fetch_oembed_service.rb	Fix link crawler not specifying accepted content-type (#12646)	5 years ago
fetch_remote_status_service.rb	Fix an error when ActivityPub::FetchRemoteStatusService url is called with nil (#12652)	5 years ago
fetch_resource_service.rb	Fix some timeouts when searching URLs by limiting some database queries (#13253)	5 years ago
follow_service.rb	Add specific rate limits for posting and following (#13172)	5 years ago
hashtag_query_service.rb	Fix hashtag timeline REST API accepting too many hashtags (#12091)	5 years ago
import_service.rb	Fix incorrect deletion of local accounts imported by overwriting (#13350)	5 years ago
move_service.rb	Fix account migration not affecting followers on origin server (#11980)	5 years ago
mute_service.rb	…
notify_service.rb	Add follow_request notification type (#12198)	5 years ago
post_status_service.rb	Fix crash when posting with a CW but no text nor media	5 years ago
precompute_feed_service.rb	…
process_hashtags_service.rb	…
process_mentions_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
reblog_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
reject_follow_service.rb	…
remove_status_service.rb	…
report_service.rb	…
resolve_account_service.rb	Fix previously OStatus-based accounts not being detected as ActivityPub (#13129)	5 years ago
resolve_url_service.rb	Fix some timeouts when searching URLs by limiting some database queries (#13253)	5 years ago
search_service.rb	Fix returning results when searching for URL with non-zero offset (#13377)	5 years ago
suspend_account_service.rb	…
tag_search_service.rb	Add `exclude_unreviewed` param to `GET /api/v2/search` REST API (#11977)	5 years ago
unallow_domain_service.rb	…
unblock_domain_service.rb	…
unblock_service.rb	…
unfavourite_service.rb	…
unfollow_service.rb	…
unmute_service.rb	…
update_account_service.rb	Fix follow requests N+1 (#12004)	5 years ago
verify_link_service.rb	…
vote_service.rb	Fix invalid votes from the API being accepted (#12601)	5 years ago