projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feat/allow_alt_text_search_config' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
controllers
/
config_controller.ex
diff --git
a/lib/pleroma/web/admin_api/controllers/config_controller.ex
b/lib/pleroma/web/admin_api/controllers/config_controller.ex
index 0df13007f67ccd01fc78ff5da859c0fd6b963924..4ebf2a305c58c7ab142cb7133f67b5c213ba43e2 100644
(file)
--- a/
lib/pleroma/web/admin_api/controllers/config_controller.ex
+++ b/
lib/pleroma/web/admin_api/controllers/config_controller.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ConfigController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ConfigController do
@@
-7,7
+7,7
@@
defmodule Pleroma.Web.AdminAPI.ConfigController do
alias Pleroma.Config
alias Pleroma.ConfigDB
alias Pleroma.Config
alias Pleroma.ConfigDB
- alias Pleroma.Plugs.OAuthScopesPlug
+ alias Pleroma.
Web.
Plugs.OAuthScopesPlug
plug(Pleroma.Web.ApiSpec.CastAndValidate)
plug(OAuthScopesPlug, %{scopes: ["write"], admin: true} when action == :update)
plug(Pleroma.Web.ApiSpec.CastAndValidate)
plug(OAuthScopesPlug, %{scopes: ["write"], admin: true} when action == :update)
@@
-122,7
+122,7
@@
defmodule Pleroma.Web.AdminAPI.ConfigController do
if Config.get(:configurable_from_database) do
:ok
else
if Config.get(:configurable_from_database) do
:ok
else
- {:error, "
To use this endpoint you need to enable configuration from databas
e."}
+ {:error, "
You must enable configurable_from_database in your config fil
e."}
end
end
end
end