Merge branch 'feature/gen-magic' into 'develop'

Use libmagic via majic Closes #1736 See merge request pleroma/pleroma!2534
2020-10-14 17:31:45 +00:00 · 2020-10-14 17:31:45 +00:00 · 2013705690
commit 2013705690
parent 9a85ec0da0 40f3cdc030
44 changed files with 118 additions and 229 deletions
--- a/test/pleroma/web/common_api_test.exs
+++ b/test/pleroma/web/common_api_test.exs
@ -100,7 +100,7 @@ defmodule Pleroma.Web.CommonAPITest do
      recipient = insert(:user)

      file = %Plug.Upload{
-        content_type: "image/jpg",
+        content_type: "image/jpeg",
        path: Path.absname("test/fixtures/image.jpg"),
        filename: "an_image.jpg"
      }