Merge branch 'release/2.9.1' into 'stable'stable

Release/2.9.1

See merge request pleroma/pleroma!4338

1 files changed, 13 insertions, 0 deletions

diff --git a/config/description.exs b/config/description.exs
index f091e4924..996978298 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -117,6 +117,19 @@ config :pleroma, :config_description, [
         key: :filename_display_max_length,
         type: :integer,
         description: "Set max length of a filename to display. 0 = no limit. Default: 30"
+      },
+      %{
+        key: :allowed_mime_types,
+        label: "Allowed MIME types",
+        type: {:list, :string},
+        description:
+          "List of MIME (main) types uploads are allowed to identify themselves with. Other types may still be uploaded, but will identify as a generic binary to clients. WARNING: Loosening this over the defaults can lead to security issues. Removing types is safe, but only add to the list if you are sure you know what you are doing.",
+        suggestions: [
+          "image",
+          "audio",
+          "video",
+          "font"
+        ]
       }
     ]
   },