diff options
| author | kaniini <nenolod@gmail.com> | 2019-06-27 04:19:44 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-06-27 04:19:44 +0000 |
| commit | 6587e2358c4746d760b212a25f6cd8b751158045 (patch) | |
| tree | 720c05e354aa1dcc1295400d8665bb1d9b13b675 /lib/pleroma | |
| parent | cfb5be3cedcd0e486851ebaf2b3abb4b838fc909 (diff) | |
| parent | c6705144a2758c76943ad7967da412572efcbc2d (diff) | |
| download | pleroma-6587e2358c4746d760b212a25f6cd8b751158045.tar.gz | |
Merge branch 'fix/admin-configure' into 'develop'
don't delete config settings on admin update
See merge request pleroma/pleroma!1340
Diffstat (limited to 'lib/pleroma')
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 953a22ea0..498beb56a 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -388,7 +388,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do |> Enum.reject(&is_nil(&1)) Pleroma.Config.TransferTask.load_and_update_env() - Mix.Tasks.Pleroma.Config.run(["migrate_from_db", Pleroma.Config.get(:env)]) + Mix.Tasks.Pleroma.Config.run(["migrate_from_db", Pleroma.Config.get(:env), "false"]) updated else [] |