Merge remote-tracking branch 'origin/develop' into shigusegubu

* origin/develop: (381 commits)
  CHANGELOG.md: Add entry for re-registration ban
  Reword changelog entry for follow relationship bug
  Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`
  Deactivate local users on deletion instead of deleting the record
  [#1732] Made AP C2S :followers and :following endpoints serve on no auth (as for related :api pipeline endpoints).
  PleromaFE bundle supporting follow request notifications. 5f90b6a384
  static-fe.css: Restore and move to /priv/static/static-fe
  OpenAPI: Add `follow_request` to notification types
  Fix sporadic test compilation failure caused by unused alias
  OpenAPI: Remove max pagination limit from the spec
  Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (`with_move`).
  MappedSignatureToIdentityPlug: Fix.
  Signature: Handle non-ap ids in key ids.
  Made follow request notifications non-optional (removed config switch).
  Increase tests on AP C2S
  Dismiss the follow request notification on rejection
  fix for auth check
  docs update
  docs fix
  list of options for pack metadata
  ...
This commit is contained in:
Henry Jameson 2020-05-02 20:03:41 +03:00
commit 74db8f4769
461 changed files with 17306 additions and 6233 deletions

View file

@ -58,20 +58,6 @@ config :pleroma, Pleroma.Captcha,
config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
config :pleroma, :hackney_pools,
federation: [
max_connections: 50,
timeout: 150_000
],
media: [
max_connections: 50,
timeout: 150_000
],
upload: [
max_connections: 25,
timeout: 300_000
]
# Upload configuration
config :pleroma, Pleroma.Upload,
uploader: Pleroma.Uploaders.Local,
@ -184,21 +170,13 @@ config :mime, :types, %{
"application/ld+json" => ["activity+json"]
}
config :tesla, adapter: Tesla.Adapter.Hackney
config :tesla, adapter: Tesla.Adapter.Gun
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
proxy_url: nil,
send_user_agent: true,
user_agent: :default,
adapter: [
ssl_options: [
# Workaround for remote server certificate chain issues
partial_chain: &:hackney_connect.partial_chain/1,
# We don't support TLS v1.3 yet
versions: [:tlsv1, :"tlsv1.1", :"tlsv1.2"]
]
]
adapter: []
config :pleroma, :instance,
name: "Shigusegubu",
@ -264,6 +242,8 @@ config :pleroma, :instance,
extended_nickname_format: true,
cleanup_attachments: false
config :pleroma, :extensions, output_relationships_in_statuses_by_default: true
config :pleroma, :feed,
post_title: %{
max_length: 100,
@ -376,7 +356,8 @@ config :pleroma, :mrf_simple,
reject: [],
accept: [],
avatar_removal: [],
banner_removal: []
banner_removal: [],
reject_deletes: []
config :pleroma, :mrf_keyword,
reject: [],
@ -644,6 +625,49 @@ config :pleroma, Pleroma.Repo,
parameters: [gin_fuzzy_search_limit: "500"],
prepare: :unnamed
config :pleroma, :connections_pool,
checkin_timeout: 250,
max_connections: 250,
retry: 1,
retry_timeout: 1000,
await_up_timeout: 5_000
config :pleroma, :pools,
federation: [
size: 50,
max_overflow: 10,
timeout: 150_000
],
media: [
size: 50,
max_overflow: 10,
timeout: 150_000
],
upload: [
size: 25,
max_overflow: 5,
timeout: 300_000
],
default: [
size: 10,
max_overflow: 2,
timeout: 10_000
]
config :pleroma, :hackney_pools,
federation: [
max_connections: 50,
timeout: 150_000
],
media: [
max_connections: 50,
timeout: 150_000
],
upload: [
max_connections: 25,
timeout: 300_000
]
config :pleroma, :restrict_unauthenticated,
timelines: %{local: false, federated: false},
profiles: %{local: false, remote: false},