Merge branch 'config-changes' into 'develop'

Config changes

Closes #1547

See merge request pleroma/pleroma!2174

config/description.exs

@@ -871,7 +871,7 @@
       },
       %{
         key: :limit_to_local_content,
-        type: [:atom, false],
+        type: {:dropdown, :atom},
         description:
           "Limit unauthenticated users to search for local statutes and users only. Default: `:unauthenticated`.",
         suggestions: [
@@ -942,7 +942,7 @@
     children: [
       %{
         key: :level,
-        type: :atom,
+        type: {:dropdown, :atom},
         description: "Log level",
         suggestions: [:debug, :info, :warn, :error]
       },
@@ -974,7 +974,7 @@
     children: [
       %{
         key: :level,
-        type: :atom,
+        type: {:dropdown, :atom},
         description: "Log level",
         suggestions: [:debug, :info, :warn, :error]
       },
@@ -998,7 +998,7 @@
     children: [
       %{
         key: :level,
-        type: :atom,
+        type: {:dropdown, :atom},
         description: "Log level",
         suggestions: [:debug, :info, :warn, :error]
       },
@@ -1969,7 +1969,7 @@
       },
       %{
         key: :verbose,
-        type: [:atom, false],
+        type: {:dropdown, :atom},
         description: "Logs verbose mode",
         suggestions: [false, :error, :warn, :info, :debug]
       },
@@ -2178,7 +2178,7 @@
       %{
         key: :new_window,
         type: :boolean,
-        description: "Set to `false` to remove target='_blank' attribute"
+        description: "Link urls will open in new window/tab"
       },
       %{
         key: :truncate,

docs/API/admin_api.md

@@ -689,7 +689,6 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
 - Response:
   - On failure:
     - 400 Bad Request `"To use this endpoint you need to enable configuration from database."`
-    - 400 Bad Request `"To use configuration from database migrate your settings to database."`
 
 ```json
 {

lib/pleroma/web/admin_api/admin_api_controller.ex

@@ -797,29 +797,16 @@ def config_show(conn, %{"only_db" => true}) do
     with :ok <- configurable_from_database(conn) do
       configs = Pleroma.Repo.all(ConfigDB)
 
-      if configs == [] do
-        errors(
-          conn,
-          {:error, "To use configuration from database migrate your settings to database."}
-        )
-      else
       conn
       |> put_view(ConfigView)
       |> render("index.json", %{configs: configs})
     end
   end
-  end
 
   def config_show(conn, _params) do
     with :ok <- configurable_from_database(conn) do
       configs = ConfigDB.get_all_as_keyword()
 
-      if configs == [] do
-        errors(
-          conn,
-          {:error, "To use configuration from database migrate your settings to database."}
-        )
-      else
       merged =
         Pleroma.Config.Holder.config()
         |> ConfigDB.merge(configs)
@@ -854,7 +841,6 @@ def config_show(conn, _params) do
       json(conn, %{configs: merged})
     end
   end
-  end
 
   def config_update(conn, %{"configs" => configs}) do
     with :ok <- configurable_from_database(conn) do

test/web/admin_api/admin_api_controller_test.exs

@@ -1899,13 +1899,6 @@ test "when configuration from database is off", %{conn: conn} do
                "To use this endpoint you need to enable configuration from database."
     end
 
-    test "without any settings in db", %{conn: conn} do
-      conn = get(conn, "/api/pleroma/admin/config")
-
-      assert json_response(conn, 400) ==
-               "To use configuration from database migrate your settings to database."
-    end
-
     test "with settings only in db", %{conn: conn} do
       config1 = insert(:config)
       config2 = insert(:config)