Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream ... Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.		2018-08-01 00:18:13 +02:00
..
activitypub
concerns
pubsubhubbub
account_search_service.rb
after_block_domain_from_account_service.rb
after_block_service.rb
authorize_follow_service.rb
backup_service.rb
base_service.rb
batched_remove_status_service.rb	Improve counter caches on Status and Account (#7644)	2018-05-30 02:50:23 +02:00
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
mute_service.rb
notify_service.rb	Add REST API for Web Push Notifications subscriptions (#7445)	2018-05-11 11:49:12 +02:00
post_status_service.rb
precompute_feed_service.rb
process_feed_service.rb
process_hashtags_service.rb
process_interaction_service.rb	Introduce OStatus::TagManager (#5008)	2017-09-19 18:08:08 +02:00
process_mentions_service.rb	Improve PostStatusService performance (#7317)	2018-05-02 22:10:57 +02:00
reblog_service.rb
reject_follow_service.rb	Add handling of Linked Data Signatures in payloads (#4687)	2017-08-26 13:47:38 +02:00
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	Close http connection in perform method of Request class (#6889)	2018-03-24 12:49:54 +01:00
suspend_account_service.rb
unblock_domain_service.rb
unblock_service.rb
unfavourite_service.rb
unfollow_service.rb
unmute_service.rb	Fix #231 - Muting	2017-03-02 18:49:32 +01:00
unsubscribe_service.rb
update_account_service.rb	authorize-follow-requests-after-unlocking (#4658)	2017-08-26 12:40:03 +02:00
update_remote_profile_service.rb	Fix custom emoji handling in UpdateRemoteProfileService (OStatus) (#7501)	2018-05-15 16:03:34 +02:00
verify_salmon_service.rb