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 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.		6 years ago
..
activitypub	…
concerns	…
pubsubhubbub	Remove redundant (#9503)	6 years ago
account_search_service.rb	…
after_block_domain_from_account_service.rb	…
after_block_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	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	…
hashtag_query_service.rb	…
mute_service.rb	…
notify_service.rb	…
post_status_service.rb	…
precompute_feed_service.rb	…
process_feed_service.rb	…
process_hashtags_service.rb	…
process_interaction_service.rb	…
process_mentions_service.rb	…
reblog_service.rb	…
reject_follow_service.rb	…
remove_status_service.rb	…
report_service.rb	…
resolve_account_service.rb	…
resolve_url_service.rb	…
search_service.rb	…
send_interaction_service.rb	…
subscribe_service.rb	…
suspend_account_service.rb	…
unblock_domain_service.rb	…
unblock_service.rb	…
unfavourite_service.rb	…
unfollow_service.rb	…
unmute_service.rb	…
unsubscribe_service.rb	…
update_account_service.rb	Error message for avatar image that's too large. #9204 (#9518)	6 years ago
update_remote_profile_service.rb	…
verify_link_service.rb	…
verify_salmon_service.rb	…