Merge branch 'develop' into media-preview-proxy

2020-09-03 10:34:06 -05:00 · 2020-09-03 10:34:06 -05:00 · 85446cc30c
commit 85446cc30c
parent 6ce28c4091 9433311923
60 changed files with 557 additions and 191 deletions
--- a/config/description.exs
+++ b/config/description.exs
@ -2441,6 +2441,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]
      }
    ]
  },