From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Thu, 12 Mar 2020 15:31:10 +0000 (+0300)
Subject: Merge branch 'develop' into gun
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=39ed608b13f9204e0503311c7394934b01501ab8;p=akkoma

Merge branch 'develop' into gun
---

39ed608b13f9204e0503311c7394934b01501ab8
diff --cc lib/pleroma/application.ex
index 55b5be488,33f1705df..719114671
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@@ -35,8 -31,9 +35,9 @@@ defmodule Pleroma.Application d
    # See http://elixir-lang.org/docs/stable/elixir/Application.html
    # for more information on OTP Applications
    def start(_type, _args) do
+     Pleroma.Config.Holder.save_default()
      Pleroma.HTML.compile_scrubbers()
 -    Pleroma.Config.DeprecationWarnings.warn()
 +    Config.DeprecationWarnings.warn()
      Pleroma.Plugs.HTTPSecurityPlug.warn_if_disabled()
      Pleroma.Repo.check_migrations_applied!()
      setup_instrumenters()
diff --cc lib/pleroma/config/transfer_task.ex
index b6d80adb7,7c3449b5e..936bc9ab1
--- a/lib/pleroma/config/transfer_task.ex
+++ b/lib/pleroma/config/transfer_task.ex
@@@ -104,7 -83,7 +104,7 @@@ defmodule Pleroma.Config.TransferTask d
        key = ConfigDB.from_string(setting.key)
        group = ConfigDB.from_string(setting.group)
  
-       default = Config.Holder.config(group, key)
 -      default = Pleroma.Config.Holder.default_config(group, key)
++      default = Config.Holder.default_config(group, key)
        value = ConfigDB.from_binary(setting.value)
  
        merged_value =