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

Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'

Browse source 
Merging default release config on app start

Closes #1610

See merge request pleroma/pleroma!2288
This commit is contained in:
rinpatch 2020-03-11 15:16:18 +00:00
commit 7cdabdc0df
10 changed files with 55 additions and 54 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} ->