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.

Claire e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.		4 years ago
..
activitypub	Use Enumerable#filter_map in more places (#15527)	4 years ago
concerns	…
keys	Fix rubocop config and warnings (#15503)	4 years ago
account_search_service.rb	Optimize some regex matching (#15528)	4 years ago
after_block_domain_from_account_service.rb	…
after_block_service.rb	…
after_unallow_domain_service.rb	…
app_sign_up_service.rb	…
authorize_follow_service.rb	…
backup_service.rb	…
base_service.rb	…
batched_remove_status_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
block_domain_service.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
block_service.rb	…
bootstrap_timeline_service.rb	…
clear_domain_media_service.rb	…
delete_account_service.rb	Update Mastodon to Rails 6.1 (#15910)	4 years ago
deliver_to_device_service.rb	…
fan_out_on_write_service.rb	Fix DMs not appearing into timelines (#15182)	4 years ago
favourite_service.rb	…
fetch_link_card_service.rb	Fix URL scanning in note length validator and preview card fetching (#15827)	4 years ago
fetch_oembed_service.rb	Fix YouTube embeds failing due to YouTube serving wrong OEmbed URLs (#15716)	4 years ago
fetch_remote_status_service.rb	…
fetch_resource_service.rb	…
follow_service.rb	Change ResolveAccountService's handling of skip_webfinger (#15750)	4 years ago
import_service.rb	Update Mastodon to Rails 6.1 (#15910)	4 years ago
move_service.rb	…
mute_service.rb	…
notify_service.rb	…
post_status_service.rb	…
precompute_feed_service.rb	…
process_hashtags_service.rb	…
process_mentions_service.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
reblog_service.rb	…
reject_follow_service.rb	…
remove_status_service.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
report_service.rb	Fix reports of already suspended accounts being recorded (#16047)	4 years ago
resolve_account_service.rb	Change ResolveAccountService's handling of skip_webfinger (#15750)	4 years ago
resolve_url_service.rb	Improve searching for private toots from URL (#14856)	4 years ago
search_service.rb	Optimize some regex matching (#15528)	4 years ago
suspend_account_service.rb	Fix remote reporters not receiving suspend/unsuspend activities (#16050)	4 years ago
tag_search_service.rb	…
unallow_domain_service.rb	…
unblock_domain_service.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
unblock_service.rb	…
unfavourite_service.rb	…
unfollow_service.rb	…
unmute_service.rb	…
unsuspend_account_service.rb	Fix remote reporters not receiving suspend/unsuspend activities (#16050)	4 years ago
update_account_service.rb	…
verify_link_service.rb	…
vote_service.rb	…