aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2021-04-14 16:52:02 +0000
committerfeld <feld@feld.me>2021-04-14 16:52:02 +0000
commit1bf2b645c590ccd959e3d482ab2651c31760c799 (patch)
treef157cca32923f2e82a1ff7dbb906a297f20eaf27 /lib
parentd2a03d3c86be86f2a131f7da0c62c9f46ca521a7 (diff)
parentf95b52255b2d7373a3e0bf4adff81f83c080b2ef (diff)
downloadpleroma-1bf2b645c590ccd959e3d482ab2651c31760c799.tar.gz
Merge branch 'fix/adminapi-concurrent-limiter' into 'develop'
Fix ConcurrentLimiter settings via AdminAPI See merge request pleroma/pleroma!3390
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/config_db.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/config_db.ex b/lib/pleroma/config_db.ex
index b874e0e37..cb57673e3 100644
--- a/lib/pleroma/config_db.ex
+++ b/lib/pleroma/config_db.ex
@@ -387,6 +387,6 @@ defmodule Pleroma.ConfigDB do
@spec module_name?(String.t()) :: boolean()
def module_name?(string) do
Regex.match?(~r/^(Pleroma|Phoenix|Tesla|Quack|Ueberauth|Swoosh)\./, string) or
- string in ["Oban", "Ueberauth", "ExSyslogger"]
+ string in ["Oban", "Ueberauth", "ExSyslogger", "ConcurrentLimiter"]
end
end