Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there.

2018-12-18 16:55:15 +01:00

..

activitypub

Lint pass (#8876)

2018-10-04 12:36:53 +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

rubocop issues - Cleaning up (#8912)

2018-10-08 04:50:11 +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

Ignore JSON-LD profile in mime type comparison (#9179)

2018-11-22 12:49:07 +01:00

fetch_link_card_service_spec.rb

Ignore low-confidence CharlockHolmes guesses when parsing link cards (#9510)

2018-12-17 19:19:45 +01: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

rubocop issues - Cleaning up (#8912)

2018-10-08 04:50:11 +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

hashtag_query_service_spec.rb

Allow joining several hashtags in a single column (#8904)

2018-11-05 18:53:25 +01:00

mute_service_spec.rb

Slightly reduce RAM usage (#7301)

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

notify_service_spec.rb

Remove duplicate and outdated specs

2018-10-30 12:46:05 +01:00

post_status_service_spec.rb

Ensure replied-to is a status not a boost (#9129)

2018-11-25 16:35:21 +01:00

precompute_feed_service_spec.rb

Slightly reduce RAM usage (#7301)

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

process_feed_service_spec.rb

rubocop issues - Cleaning up (#8912)

2018-10-08 04:50:11 +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

rubocop issues - Cleaning up (#8912)

2018-10-08 04:50:11 +02:00

verify_link_service_spec.rb

Fix link verification for remote accounts (#8868)

2018-10-04 15:47:03 +02:00