Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.		2019-01-10 21:00:30 +01:00
..
activitypub	…
concerns	…
pubsubhubbub	…
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_atom_service.rb	…
fetch_link_card_service.rb	…
fetch_oembed_service.rb	…
fetch_remote_account_service.rb	…
fetch_remote_status_service.rb	…
follow_service.rb	…
hashtag_query_service.rb	…
mute_service.rb	…
notify_service.rb	…
post_status_service.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
precompute_feed_service.rb	…
process_feed_service.rb	…
process_hashtags_service.rb	…
process_interaction_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	…
send_interaction_service.rb	…
subscribe_service.rb	…
suspend_account_service.rb	…
unblock_domain_service.rb	…
unblock_service.rb	…
unfavourite_service.rb	…
unfollow_service.rb	…
unmute_service.rb	…
unsubscribe_service.rb	…
update_account_service.rb	…
update_remote_profile_service.rb	…
verify_link_service.rb	…
verify_salmon_service.rb	…