hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merging release default config on app start

Browse source
This commit is contained in:
Alexander Strizhakov 2020-03-11 16:25:53 +03:00
commit 282a93554f
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
10 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/admin_api/admin_api_controller.ex
View file

@ -834,7 +834,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
configs = ConfigDB.get_all_as_keyword()
merged =
Config.Holder.config()
Config.Holder.default_config()
|> ConfigDB.merge(configs)
|> Enum.map(fn {group, values} ->
Enum.map(values, fn {key, value} ->