From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Tue, 18 Feb 2020 14:52:31 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=226f4d5ef93805e2ff93f00d443238ab7afeb3e6;p=akkoma

Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks

# Conflicts:
#	test/web/admin_api/admin_api_controller_test.exs
---

226f4d5ef93805e2ff93f00d443238ab7afeb3e6
diff --cc test/web/admin_api/admin_api_controller_test.exs
index ddfb9a5f5,60db58144..908ef4d37
--- a/test/web/admin_api/admin_api_controller_test.exs
+++ b/test/web/admin_api/admin_api_controller_test.exs
@@@ -1890,7 -1893,9 +1893,7 @@@ defmodule Pleroma.Web.AdminAPI.AdminAPI
      end
  
      test "when configuration from database is off", %{conn: conn} do
-       Pleroma.Config.put(:configurable_from_database, false)
 -      initial = Config.get(:configurable_from_database)
+       Config.put(:configurable_from_database, false)
 -      on_exit(fn -> Config.put(:configurable_from_database, initial) end)
        conn = get(conn, "/api/pleroma/admin/config")
  
        assert json_response(conn, 400) ==