249991c498
Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml |
||
---|---|---|
.. | ||
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 | ||
fan_out_on_write_service_spec.rb | ||
favourite_service_spec.rb | ||
fetch_link_card_service_spec.rb | ||
fetch_oembed_service_spec.rb | ||
fetch_remote_account_service_spec.rb | ||
fetch_remote_status_service_spec.rb | ||
fetch_resource_service_spec.rb | ||
follow_service_spec.rb | ||
hashtag_query_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 | ||
suspend_account_service_spec.rb | ||
unblock_domain_service_spec.rb | ||
unblock_service_spec.rb | ||
unfollow_service_spec.rb | ||
unmute_service_spec.rb | ||
verify_link_service_spec.rb |