summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-06-14 19:37:59 +0100
committerGitHub <noreply@github.com>2019-06-14 19:37:59 +0100
commitf12e1f029c5e805548438ffea2d125e0fdb39467 (patch)
tree11b748b10216dce60a554244fec530cd5ede7cfc /synapse/config/homeserver.py
parentMerge pull request #5461 from matrix-org/erikj/histograms_are_cumalitive (diff)
parentAdd plugin APIs for implementations of custom event rules. (diff)
downloadsynapse-f12e1f029c5e805548438ffea2d125e0fdb39467.tar.xz
Merge pull request #5440 from matrix-org/babolivier/third_party_event_rules
Allow server admins to define implementations of extra rules for allowing or denying incoming events
Diffstat (limited to 'synapse/config/homeserver.py')
-rw-r--r--synapse/config/homeserver.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py
index 5c4fc8ff21..acadef4fd3 100644
--- a/synapse/config/homeserver.py
+++ b/synapse/config/homeserver.py
@@ -38,6 +38,7 @@ from .server import ServerConfig
 from .server_notices_config import ServerNoticesConfig
 from .spam_checker import SpamCheckerConfig
 from .stats import StatsConfig
+from .third_party_event_rules import ThirdPartyRulesConfig
 from .tls import TlsConfig
 from .user_directory import UserDirectoryConfig
 from .voip import VoipConfig
@@ -73,5 +74,6 @@ class HomeServerConfig(
     StatsConfig,
     ServerNoticesConfig,
     RoomDirectoryConfig,
+    ThirdPartyRulesConfig,
 ):
     pass