diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-07-09 12:49:04 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-07-09 12:49:04 -0500 |
| commit | 9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96 (patch) | |
| tree | fc28e2fb05ad0158fe881de7a49e90d941e10ad4 /lib/mix/tasks | |
| parent | 9f235028569968871ef9ea933459c6e9369e737a (diff) | |
| parent | e19e82975871388831fd23adc50fcaaea85ad5da (diff) | |
| download | pleroma-9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96.tar.gz | |
Merge branch 'develop' into feature/allow-user-query-via-id
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 a27c4b897..2ae16adc0 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]) ) |