Merge branch 'feat/rich-media-improvements' into 'develop'

Rich media improvements See merge request pleroma/pleroma!2944
2020-09-02 13:46:11 +00:00 · 2020-09-02 13:46:11 +00:00 · ea4b6c64d6
commit ea4b6c64d6
parent 8c3241df44
8 changed files with 64 additions and 27 deletions
--- a/config/description.exs
+++ b/config/description.exs
@ -2385,6 +2385,13 @@ config :pleroma, :config_description, [
        suggestions: [
          Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl
        ]
+      },
+      %{
+        key: :failure_backoff,
+        type: :integer,
+        description:
+          "Amount of milliseconds after request failure, during which the request will not be retried.",
+        suggestions: [60_000]
      }
    ]
  },