Thibaut Girka ff67385cfb Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code		2019-11-20 15:36:09 +01:00
..
activitypub
concerns
account_search_service.rb
after_block_domain_from_account_service.rb	Change account domain block to clear out notifications and follows (#11393)	2019-07-25 04:17:35 +02:00
after_block_service.rb	Change account domain block to clear out notifications and follows (#11393)	2019-07-25 04:17:35 +02:00
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	Fix BackupService crashing when an attachment is missing (#11241)	2019-07-15 00:48:49 +02:00
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	Add cache for OEmbed endpoints to avoid extra HTTP requests (#12403)	2019-11-17 18:40:33 +01: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
move_service.rb
mute_service.rb
notify_service.rb	Fix poll update handler calling method was that was not available (#10246)	2019-03-12 22:58:59 +01:00
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-09-18 17:25:56 +02:00
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	Fix #231 - Muting	2017-03-02 18:49:32 +01:00
update_account_service.rb
verify_link_service.rb
vote_service.rb