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

some refactor and tests

Browse source
This commit is contained in:
Alexander Strizhakov 2020-01-21 17:49:22 +03:00
commit f01ab6cd29
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
10 changed files with 308 additions and 201 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

@ -848,7 +848,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
merged_value =
if !is_nil(db_value) and Keyword.keyword?(db_value) and
ConfigDB.sub_key_full_update?(group, key, Keyword.keys(db_value)) do
ConfigDB.deep_merge(group, key, value, db_value)
ConfigDB.merge_group(group, key, value, db_value)
else
value
end