From: Alexander Strizhakov Date: Fri, 17 Jan 2020 08:54:22 +0000 (+0300) Subject: fix for config loader X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=58e8963824bd3375ec1fa04b265187a888aaa5ea;p=akkoma fix for config loader --- diff --git a/lib/pleroma/config/holder.ex b/lib/pleroma/config/holder.ex index aa35382b2..c8badc52c 100644 --- a/lib/pleroma/config/holder.ex +++ b/lib/pleroma/config/holder.ex @@ -12,8 +12,8 @@ defmodule Pleroma.Config.Loader do # support for Elixir less than 1.9 @spec load() :: map() def load do - config = Mix.Config.eval!("config/config.exs") - env_config = Mix.Config.eval!("config/#{Mix.env()}.exs") + {config, _paths} = Mix.Config.eval!("config/config.exs") + {env_config, _paths} = Mix.Config.eval!("config/#{Mix.env()}.exs") Mix.Config.merge(config, env_config) end