summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2021-02-04 14:33:59 +0000
committerfeld <feld@feld.me>2021-02-04 14:33:59 +0000
commit7b67bf4e970dcc641bcfdc137f306504c064d52d (patch)
treeb6ffa3fae16f244801e3657bbe30c8008bcdaaaa /lib
parentea5469961a537d12ca799bf7470e53cb636b1439 (diff)
parent5fcab23aa3a6187d2e8746ff92330ab2aed807f6 (diff)
Merge branch 'fix/configdb-error' into 'develop'
Improve error message for ConfigDB See merge request pleroma/pleroma!3289
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/admin_api/controllers/admin_api_controller.ex2
-rw-r--r--lib/pleroma/web/admin_api/controllers/config_controller.ex2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
index 8f89f066a..d581df4a2 100644
--- a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
@@ -406,7 +406,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
if Config.get(:configurable_from_database) do
:ok
else
- {:error, "To use this endpoint you need to enable configuration from database."}
+ {:error, "You must enable configurable_from_database in your config file."}
end
end
diff --git a/lib/pleroma/web/admin_api/controllers/config_controller.ex b/lib/pleroma/web/admin_api/controllers/config_controller.ex
index 7872fe2d8..4ebf2a305 100644
--- a/lib/pleroma/web/admin_api/controllers/config_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/config_controller.ex
@@ -122,7 +122,7 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do
if Config.get(:configurable_from_database) do
:ok
else
- {:error, "To use this endpoint you need to enable configuration from database."}
+ {:error, "You must enable configurable_from_database in your config file."}
end
end