Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

# Conflicts:
#	CHANGELOG.md

diff --combined CHANGELOG.md
index 3974885848fbc8ccba3887f5673ae3b99ca1cf7d,72dfbedd0faca9c4ce3c887a14cce8b604f36099..421649e6fe982b130bc8a8e8935c198f2d356daa
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -24,7 -24,7 +24,8 @@@ The format is based on [Keep a Changelo
  - Ability to view remote timelines, with ex. `/api/v1/timelines/public?instance=lain.com` and streams `public:remote` and `public:remote:media`.
  - The site title is now injected as a `title` tag like preloads or metadata.
  - Password reset tokens now are not accepted after a certain age.
+ - Mix tasks to help with displaying and removing ConfigDB entries. See `mix pleroma.config`
 +- OAuth form improvements: users are remembered by their cookie, the CSS is overridable by the admin, and the style has been improved.
  
  <details>
    <summary>API Changes</summary>

diff --combined test/pleroma/web/admin_api/controllers/config_controller_test.exs
index 765a5a4b7fc35e29105a53837d14615f930affb2,276e827d1b7c0a1ddbb9f59a7c6d24375f99c6b6..e6b203e7470685ba5838df176072fd93ed834a2b
--- 1/test/pleroma/web/admin_api/controllers/config_controller_test.exs
--- 2/test/pleroma/web/admin_api/controllers/config_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/config_controller_test.exs
@@@ -162,7 -162,9 +162,9 @@@ defmodule Pleroma.Web.AdminAPI.ConfigCo
      end
    end
  
-   test "POST /api/pleroma/admin/config error", %{conn: conn} do
+   test "POST /api/pleroma/admin/config with configdb disabled", %{conn: conn} do
+     clear_config(:configurable_from_database, false)
+ 
      conn =
        conn
        |> put_req_header("content-type", "application/json")
@@@ -1415,7 -1417,11 +1417,7 @@@
  
    describe "GET /api/pleroma/admin/config/descriptions" do
      test "structure", %{conn: conn} do
 -      admin = insert(:user, is_admin: true)
 -
 -      conn =
 -        assign(conn, :user, admin)
 -        |> get("/api/pleroma/admin/config/descriptions")
 +      conn = get(conn, "/api/pleroma/admin/config/descriptions")
  
        assert [child | _others] = json_response_and_validate_schema(conn, 200)
  
@@@ -1433,7 -1439,11 +1435,7 @@@
          {:esshd}
        ])
  
 -      admin = insert(:user, is_admin: true)
 -
 -      conn =
 -        assign(conn, :user, admin)
 -        |> get("/api/pleroma/admin/config/descriptions")
 +      conn = get(conn, "/api/pleroma/admin/config/descriptions")
  
        children = json_response_and_validate_schema(conn, 200)