Commit 45627dde authored by lain's avatar lain
Browse files

Merge branch 'develop' into 'develop'

Fix failure to serve media from custom upload path

See merge request !95
parents d70d1c42 033771d9
Pipeline #1101 passed with stage
in 2 minutes and 48 seconds
......@@ -58,7 +58,7 @@ def store(%{"img" => "data:image/" <> image_data}) do
}
end
defp upload_path do
def upload_path do
settings = Application.get_env(:pleroma, Pleroma.Upload)
Keyword.fetch!(settings, :uploads)
end
......
......@@ -11,7 +11,7 @@ defmodule Pleroma.Web.Endpoint do
#
# You should set gzip to true if you are running phoenix.digest
# when deploying your static files in production.
plug(Plug.Static, at: "/media", from: "uploads", gzip: false)
plug(Plug.Static, at: "/media", from: Pleroma.Upload.upload_path(), gzip: false)
plug(
Plug.Static,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment