Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.		2020-03-22 16:10:44 +01: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	…
backup_service.rb	…
base_service.rb	…
batched_remove_status_service.rb	…
block_domain_service.rb	…
block_service.rb	…
bootstrap_timeline_service.rb	…
fan_out_on_write_service.rb	…
favourite_service.rb	…
fetch_link_card_service.rb	…
fetch_oembed_service.rb	…
fetch_remote_status_service.rb	…
fetch_resource_service.rb	…
follow_service.rb	…
hashtag_query_service.rb	…
import_service.rb	…
move_service.rb	…
mute_service.rb	…
notify_service.rb	…
post_status_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-22 16:10:44 +01:00
precompute_feed_service.rb	…
process_hashtags_service.rb	…
process_mentions_service.rb	…
reblog_service.rb	…
reject_follow_service.rb	…
remove_status_service.rb	…
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	…
unmute_service.rb	…
update_account_service.rb	…
verify_link_service.rb	…
vote_service.rb	…