mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 20:27:07 +00:00
9b861d56a9
Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version. |
||
---|---|---|
.. | ||
activitypub | ||
account_search_service_spec.rb | ||
account_statuses_cleanup_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_from_follwers_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 | ||
suspend_account_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 | ||
unsuspend_account_service_spec.rb | ||
update_account_service_spec.rb | ||
verify_link_service_spec.rb |