Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js

2018-09-19 21:46:01 +02:00

..

activitypub

Improve federated ID validation (#8372)

2018-08-22 20:55:14 +02:00

pubsubhubbub

Slightly reduce RAM usage (#7301)

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

account_search_service_spec.rb

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +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

authorize_follow_service_spec.rb

Slightly reduce RAM usage (#7301)

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

batched_remove_status_service_spec.rb

Slightly reduce RAM usage (#7301)

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

block_domain_service_spec.rb

Slightly reduce RAM usage (#7301)

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

block_service_spec.rb

Slightly reduce RAM usage (#7301)

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

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

Slightly reduce RAM usage (#7301)

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

favourite_service_spec.rb

Slightly reduce RAM usage (#7301)

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

fetch_atom_service_spec.rb

Slightly reduce RAM usage (#7301)

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

fetch_link_card_service_spec.rb

Slightly reduce RAM usage (#7301)

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

fetch_oembed_service_spec.rb

Slightly reduce RAM usage (#7301)

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

fetch_remote_account_service_spec.rb

Improve federated ID validation (#8372)

2018-08-22 20:55:14 +02:00

fetch_remote_status_service_spec.rb

Improve federated ID validation (#8372)

2018-08-22 20:55:14 +02:00

follow_service_spec.rb

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +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 'origin/master' into gs-master

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

post_status_service_spec.rb

Slightly reduce RAM usage (#7301)

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

precompute_feed_service_spec.rb

Slightly reduce RAM usage (#7301)

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

process_feed_service_spec.rb

Misc. typos (#8694)

2018-09-14 00:53:09 +02:00

process_interaction_service_spec.rb

Slightly reduce RAM usage (#7301)

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

process_mentions_service_spec.rb

Slightly reduce RAM usage (#7301)

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

reblog_service_spec.rb

Slightly reduce RAM usage (#7301)

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

reject_follow_service_spec.rb

Slightly reduce RAM usage (#7301)

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

remove_status_service_spec.rb

Slightly reduce RAM usage (#7301)

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

report_service_spec.rb

Add preference for report notification e-mails, skip for duplicates (#8559)

2018-09-02 00:11:58 +02:00

resolve_account_service_spec.rb

Take the first recognized actor_type. (#7410)

2018-05-08 13:30:04 +02:00

resolve_url_service_spec.rb

Slightly reduce RAM usage (#7301)

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

search_service_spec.rb

Allow accessing local private/DM messages by URL (#8196)

2018-08-15 19:33:36 +02:00

send_interaction_service_spec.rb

Slightly reduce RAM usage (#7301)

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

subscribe_service_spec.rb

Slightly reduce RAM usage (#7301)

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

suspend_account_service_spec.rb

Increase reach of Delete->Actor activities (#8305)

2018-08-20 13:28:05 +02:00

unblock_domain_service_spec.rb

Slightly reduce RAM usage (#7301)

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

unblock_service_spec.rb

Slightly reduce RAM usage (#7301)

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

unfollow_service_spec.rb

Slightly reduce RAM usage (#7301)

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

unmute_service_spec.rb

Slightly reduce RAM usage (#7301)

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

unsubscribe_service_spec.rb

Slightly reduce RAM usage (#7301)

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

update_remote_profile_service_spec.rb

Slightly reduce RAM usage (#7301)

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

verify_link_service_spec.rb

Fix failed profile verification when rel attribute including values other than me (#8733)

2018-09-19 16:47:31 +02:00