diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-09 21:21:09 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-09 21:21:09 +0300 |
| commit | 371d39e160efa51f2fe608e1788f6b11b89d9839 (patch) | |
| tree | b5dc6280d713f11392fd47bffd1a675b527162f5 /lib/mix/tasks | |
| parent | d2cb18b2a342b990cc47dfdc42adb843c3db1b5e (diff) | |
| parent | 670a77ecbc94d57c6ecb5e569597e81cee4b5532 (diff) | |
| download | pleroma-371d39e160efa51f2fe608e1788f6b11b89d9839.tar.gz | |
Merge develop
Diffstat (limited to 'lib/mix/tasks')
| -rw-r--r-- | lib/mix/tasks/pleroma/ecto/ecto.ex | 1 | ||||
| -rw-r--r-- | lib/mix/tasks/pleroma/instance.ex | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/mix/tasks/pleroma/ecto/ecto.ex b/lib/mix/tasks/pleroma/ecto/ecto.ex index 324f57fdd..b66f63376 100644 --- a/lib/mix/tasks/pleroma/ecto/ecto.ex +++ b/lib/mix/tasks/pleroma/ecto/ecto.ex @@ -1,6 +1,7 @@ # Pleroma: A lightweight social networking server # Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-onl + defmodule Mix.Tasks.Pleroma.Ecto do @doc """ Ensures the given repository's migrations path exists on the file system. diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex index 0231b76cd..f08e5ff3f 100644 --- a/lib/mix/tasks/pleroma/instance.ex +++ b/lib/mix/tasks/pleroma/instance.ex @@ -149,7 +149,7 @@ defmodule Mix.Tasks.Pleroma.Instance do uploads_dir = get_option( options, - :upload_dir, + :uploads_dir, "What directory should media uploads go in (when using the local uploader)?", Pleroma.Config.get([Pleroma.Uploaders.Local, :uploads]) ) |