Merge branch 'fix/1058-uploads-dir-consistency' into 'develop'

tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir

Closes #1058

See merge request pleroma/pleroma!1378
This commit is contained in:
rinpatch 2019-07-05 18:55:27 +00:00
commit 3589b30ddc

View File

@ -149,7 +149,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
uploads_dir = uploads_dir =
get_option( get_option(
options, options,
:upload_dir, :uploads_dir,
"What directory should media uploads go in (when using the local uploader)?", "What directory should media uploads go in (when using the local uploader)?",
Pleroma.Config.get([Pleroma.Uploaders.Local, :uploads]) Pleroma.Config.get([Pleroma.Uploaders.Local, :uploads])
) )