Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		2019-08-19 21:49:35 +02:00
..
activitypub
concerns
account_search_service.rb
after_block_domain_from_account_service.rb
after_block_service.rb
app_sign_up_service.rb
authorize_follow_service.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
backup_service.rb
base_service.rb
batched_remove_status_service.rb
block_domain_service.rb
block_service.rb	Fix BlockService trying to reject incorrect follow request (#11288)	2019-07-11 14:50:27 +02:00
bootstrap_timeline_service.rb
fan_out_on_write_service.rb
favourite_service.rb
fetch_link_card_service.rb	Refactor fetching of remote resources (#11251)	2019-07-10 18:59:28 +02:00
fetch_oembed_service.rb
fetch_remote_account_service.rb
fetch_remote_status_service.rb
fetch_resource_service.rb
follow_service.rb
hashtag_query_service.rb
import_service.rb
mute_service.rb
notify_service.rb
post_status_service.rb
precompute_feed_service.rb
process_hashtags_service.rb
process_mentions_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
reblog_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
reject_follow_service.rb
remove_status_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-07 13:56:48 +02:00
report_service.rb
resolve_account_service.rb
resolve_url_service.rb
search_service.rb
suspend_account_service.rb
tag_search_service.rb
unallow_domain_service.rb
unblock_domain_service.rb
unblock_service.rb
unfavourite_service.rb
unfollow_service.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
unmute_service.rb
update_account_service.rb
verify_link_service.rb
vote_service.rb