logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 2f6a1c58fca83c38d518723952a0a50e6682394d
parent d3a5e0969b6e07b55b9c97da8ccb2287eda5834a
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Wed, 10 Jun 2020 18:29:32 +0200

ConfigController: Remove db-config limit on reading

Diffstat:

Mlib/pleroma/web/admin_api/controllers/config_controller.ex4++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/web/admin_api/controllers/config_controller.ex b/lib/pleroma/web/admin_api/controllers/config_controller.ex @@ -29,7 +29,7 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do end def show(conn, %{only_db: true}) do - with :ok <- configurable_from_database() do + with :ok <- :ok do configs = Pleroma.Repo.all(ConfigDB) render(conn, "index.json", %{ @@ -40,7 +40,7 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do end def show(conn, _params) do - with :ok <- configurable_from_database() do + with :ok <- :ok do configs = ConfigDB.get_all_as_keyword() merged =