Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ...

Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml

2018-05-10 00:03:28 +02:00

..

activitypub

…

pubsubhubbub

…

account_search_service_spec.rb

…

after_block_service_spec.rb

…

authorize_follow_service_spec.rb

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +02:00

batched_remove_status_service_spec.rb

…

block_domain_from_account_service_spec.rb

…

block_domain_service_spec.rb

…

block_service_spec.rb

…

bootstrap_timeline_service_spec.rb

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +02:00

fan_out_on_write_service_spec.rb

…

favourite_service_spec.rb

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +02:00

fetch_atom_service_spec.rb

…

fetch_link_card_service_spec.rb

…

fetch_oembed_service_spec.rb

…

fetch_remote_account_service_spec.rb

…

fetch_remote_status_service_spec.rb

…

follow_service_spec.rb

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +02:00

mute_service_spec.rb

…

notify_service_spec.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

post_status_service_spec.rb

…

precompute_feed_service_spec.rb

…

process_feed_service_spec.rb

…

process_interaction_service_spec.rb

…

process_mentions_service_spec.rb

…

reblog_service_spec.rb

…

reject_follow_service_spec.rb

…

remove_status_service_spec.rb

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +02:00

report_service_spec.rb

…

resolve_account_service_spec.rb

…

resolve_url_service_spec.rb

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +02:00

search_service_spec.rb

…

send_interaction_service_spec.rb

…

subscribe_service_spec.rb

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +02:00

suspend_account_service_spec.rb

…

unblock_domain_service_spec.rb

…

unblock_service_spec.rb

…

unfollow_service_spec.rb

…

unmute_service_spec.rb

…

unsubscribe_service_spec.rb

…

update_remote_profile_service_spec.rb

…