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	Add support for Audio activities (#11189)	2019-06-26 19:32:36 +02:00
account_search_service_spec.rb	Add more accurate account search (#11537)	2019-08-16 01:24:03 +02:00
after_block_domain_from_account_service_spec.rb	Fix domain hiding logic (#7765)	2018-06-09 22:46:54 +02:00
after_block_service_spec.rb	Slightly reduce RAM usage (#7301)	2018-05-02 18:58:48 +02:00
app_sign_up_service_spec.rb	Add reason param to POST /api/v1/accounts REST API (#12064)	2019-10-03 17:50:59 +02:00
authorize_follow_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
batched_remove_status_service_spec.rb	Remove WebSub subscriptions (#11303)	2019-07-21 04:08:00 +02:00
block_domain_service_spec.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00
block_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
bootstrap_timeline_service_spec.rb	Fix BootstrapTimelineService crashing when bootstrapped accounts are invalid (#12037)	2019-10-01 15:10:00 +02:00
fan_out_on_write_service_spec.rb	Slightly reduce RAM usage (#7301)	2018-05-02 18:58:48 +02:00
favourite_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
fetch_link_card_service_spec.rb	Add noopener and/or noreferrer (#12202)	2019-10-24 22:44:42 +02:00
fetch_oembed_service_spec.rb	Add cache for OEmbed endpoints to avoid extra HTTP requests (#12403)	2019-11-17 18:40:33 +01:00
fetch_remote_account_service_spec.rb	Add ActivityPub actor representing the entire server (#11321)	2019-07-19 01:44:42 +02:00
fetch_remote_status_service_spec.rb	Improve federated ID validation (#8372)	2018-08-22 20:55:14 +02:00
fetch_resource_service_spec.rb	Add ActivityPub actor representing the entire server (#11321)	2019-07-19 01:44:42 +02:00
follow_service_spec.rb	Change silences to always require approval on follow (#11975)	2019-09-27 21:13:51 +02:00
hashtag_query_service_spec.rb	Allow joining several hashtags in a single column (#8904)	2018-11-05 18:53:25 +01:00
import_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
mute_service_spec.rb	Slightly reduce RAM usage (#7301)	2018-05-02 18:58:48 +02:00
notify_service_spec.rb	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	2019-06-03 14:54:30 +02:00
post_status_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
precompute_feed_service_spec.rb	Slightly reduce RAM usage (#7301)	2018-05-02 18:58:48 +02:00
process_mentions_service_spec.rb	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
reblog_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
reject_follow_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
remove_status_service_spec.rb	Remove WebSub subscriptions (#11303)	2019-07-21 04:08:00 +02:00
report_service_spec.rb	Set and store report URIs (#10303)	2019-03-17 15:34:56 +01:00
resolve_account_service_spec.rb	Refactor domain block checks (#11268)	2019-07-09 03:27:35 +02:00
resolve_url_service_spec.rb	Refactor fetching of remote resources (#11251)	2019-07-10 18:59:28 +02:00
search_service_spec.rb	Add exclude_unreviewed param to GET /api/v2/search REST API (#11977)	2019-09-28 01:02:21 +02:00
suspend_account_service_spec.rb	Remove WebSub subscriptions (#11303)	2019-07-21 04:08:00 +02:00
unblock_domain_service_spec.rb	Add domain block notes (#11515)	2019-08-07 20:20:23 +02:00
unblock_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
unfollow_service_spec.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
unmute_service_spec.rb	Slightly reduce RAM usage (#7301)	2018-05-02 18:58:48 +02:00
update_account_service_spec.rb	Change silences to always require approval on follow (#11975)	2019-09-27 21:13:51 +02:00
verify_link_service_spec.rb	Add noopener and/or noreferrer (#12202)	2019-10-24 22:44:42 +02:00