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 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		3 years ago
..
activitypub	…
account_search_service_spec.rb	…
after_block_domain_from_account_service_spec.rb	…
after_block_service_spec.rb	…
app_sign_up_service_spec.rb	…
authorize_follow_service_spec.rb	…
batched_remove_status_service_spec.rb	…
block_domain_service_spec.rb	…
block_service_spec.rb	…
bootstrap_timeline_service_spec.rb	…
clear_domain_media_service_spec.rb	…
delete_account_service_spec.rb	…
fan_out_on_write_service_spec.rb	…
favourite_service_spec.rb	…
fetch_link_card_service_spec.rb	…
fetch_oembed_service_spec.rb	…
fetch_remote_status_service_spec.rb	…
fetch_resource_service_spec.rb	…
follow_service_spec.rb	…
import_service_spec.rb	…
mute_service_spec.rb	…
notify_service_spec.rb	…
post_status_service_spec.rb	…
precompute_feed_service_spec.rb	…
process_mentions_service_spec.rb	…
reblog_service_spec.rb	…
reject_follow_service_spec.rb	…
remove_status_service_spec.rb	…
report_service_spec.rb	…
resolve_account_service_spec.rb	…
resolve_url_service_spec.rb	…
search_service_spec.rb	…
unallow_domain_service_spec.rb	…
unblock_domain_service_spec.rb	…
unblock_service_spec.rb	…
unfollow_service_spec.rb	…
unmute_service_spec.rb	…
update_account_service_spec.rb	…
verify_link_service_spec.rb	…