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 980c004f06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one		5 years ago
..
activitypub	Clarify keyword arguments with ** (#12769)	5 years ago
concerns	…
account_search_service.rb	Fix account search with no query (#12549)	5 years ago
after_block_domain_from_account_service.rb	…
after_block_service.rb	…
app_sign_up_service.rb	…
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	Use quality values in Accept field to explicitly prefer JSON over HTML (#12806)	5 years ago
follow_service.rb	Fix various issues with account migration (#12301)	5 years ago
hashtag_query_service.rb	Fix hashtag timeline REST API accepting too many hashtags (#12091)	5 years ago
import_service.rb	…
move_service.rb	…
mute_service.rb	…
notify_service.rb	Add follow_request notification type (#12198)	5 years ago
post_status_service.rb	…
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	…
reject_follow_service.rb	…
remove_status_service.rb	…
report_service.rb	…
resolve_account_service.rb	…
resolve_url_service.rb	Fix URL search not returning private toots user has access to (#12742)	5 years ago
search_service.rb	Fix error when using search API with no query (#12541)	5 years ago
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	…
update_account_service.rb	…
verify_link_service.rb	…
vote_service.rb	Fix invalid votes from the API being accepted (#12601)	5 years ago