diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-24 08:06:04 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-24 08:06:04 +0300 |
| commit | d75d0ae134e0a8de9504507f4c78567b9eedcc72 (patch) | |
| tree | b7be0da8e19018241cc22509863fefadabe8ff08 /config/description.exs | |
| parent | 494bb6bac64361860db194aed57618450a76177d (diff) | |
| parent | 29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965 (diff) | |
| download | pleroma-d75d0ae134e0a8de9504507f4c78567b9eedcc72.tar.gz pleroma-d75d0ae134e0a8de9504507f4c78567b9eedcc72.zip | |
Merge branch 'develop' into tests/mastodon_api_controller.ex
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config/description.exs b/config/description.exs index 5dc8dc364..38b30bbf6 100644 --- a/config/description.exs +++ b/config/description.exs @@ -110,6 +110,12 @@ config :pleroma, :config_description, [ description: "If you use S3 compatible service such as Digital Ocean Spaces or CDN, set folder name or \"\" etc." <> " For example, when using CDN to S3 virtual host format, set \"\". At this time, write CNAME to CDN in public_endpoint." + }, + %{ + key: :streaming_enabled, + type: :boolean, + description: + "Enable streaming uploads, when enabled the file will be sent to the server in chunks as it's being read. This may be unsupported by some providers, try disabling this if you have upload problems." } ] }, @@ -1900,7 +1906,7 @@ config :pleroma, :config_description, [ key: :rel, type: [:string, false], description: "override the rel attribute. false to clear", - suggestions: ["noopener noreferrer", false] + suggestions: ["ugc", "noopener noreferrer", false] }, %{ key: :new_window, |