fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-23 15:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for config loader

Browse source
This commit is contained in:
Alexander Strizhakov 2020-01-17 11:54:22 +03:00
parent 60ba2339a2
commit 58e8963824
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/config/holder.ex
View file

@ -12,8 +12,8 @@ defmodule Pleroma.Config.Loader do
# support for Elixir less than 1.9 # support for Elixir less than 1.9
@spec load() :: map() @spec load() :: map()
def load do def load do
config = Mix.Config.eval!("config/config.exs") {config, _paths} = Mix.Config.eval!("config/config.exs")
env_config = Mix.Config.eval!("config/#{Mix.env()}.exs") {env_config, _paths} = Mix.Config.eval!("config/#{Mix.env()}.exs")
Mix.Config.merge(config, env_config) Mix.Config.merge(config, env_config)
end end