diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-01-06 14:05:32 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-01-10 15:52:02 +0300 |
| commit | 88a16bb9fcd1f80b8a2634e815cb855d3a8346ee (patch) | |
| tree | 34628d33c16b94557ffd0cd505520d673eab7291 /lib | |
| parent | c841174de820c891929b206e3eb2604cb6368ae6 (diff) | |
| download | pleroma-88a16bb9fcd1f80b8a2634e815cb855d3a8346ee.tar.gz | |
deep merge in config update
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/admin_api/config.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/config.ex b/lib/pleroma/web/admin_api/config.ex index b55851602..a01c28716 100644 --- a/lib/pleroma/web/admin_api/config.ex +++ b/lib/pleroma/web/admin_api/config.ex @@ -81,7 +81,7 @@ defmodule Pleroma.Web.AdminAPI.Config do old_value <- from_binary(config.value), transformed_value <- do_transform(params[:value]), {:can_be_merged, true, config} <- {:can_be_merged, is_list(transformed_value), config}, - new_value <- Keyword.merge(old_value, transformed_value) do + new_value <- DeepMerge.deep_merge(old_value, transformed_value) do Config.update(config, %{value: new_value, transformed?: true}) else {reason, false, config} when reason in [:partial_update, :can_be_merged] -> |