mastodon/spec/services
Thibaut Girka aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
2019-06-26 23:19:22 +02:00
..
activitypub
…
pubsubhubbub
…
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_atom_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
…
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_feed_service_spec.rb
…
process_interaction_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
…
send_interaction_service_spec.rb
…
subscribe_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
…
unsubscribe_service_spec.rb
…
update_remote_profile_service_spec.rb
…
verify_link_service_spec.rb
…