Added the erlang-ssh package to the dependency list and the installation
command instructions. The project wouldn't build otherwise.

[ci skip]

Merge conflict in lib/pleroma/activity.ex

Maksim authored 5 years ago and lain committed 5 years ago

Modified-by: Maksim Pechnikov <parallel588@gmail.com>

Alexander Strizhakov authored 5 years ago and lain committed 5 years ago

Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion

Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API

This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674)

Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs

witches.live authored 5 years ago and Haelwenn committed 5 years ago

Include explicit warning for emerge config line as it will vary more widely based on current version of postgres

Alexander Strizhakov authored 5 years ago and lain committed 5 years ago

docs for RelMe provider

Allow instance admins to set their own SameSite cookie policy from
the config. Default value in the config is `Lax`.

See [1] for confirmation.
1: pleroma/pleroma!1050 (comment 24402)

keyword style change

code style and little renamings