summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2022-02-02 09:49:31 -0500
committerGitHub <noreply@github.com>2022-02-02 09:49:31 -0500
commitacda9f07c858902ab072d49f6ad3e26df874d06e (patch)
treec820ade1021c884c6c99f57a1b955512eae4b1ff /synapse/config
parentAdd a background database update to purge account data for deactivated users.... (diff)
downloadsynapse-acda9f07c858902ab072d49f6ad3e26df874d06e.tar.xz
Revert experimental push rules from #7997. (#11884)
Manually reverts the merge from cdbb8e6d6e36e0b6bc36e676d8fe66c96986b399.
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/server.py13
1 files changed, 0 insertions, 13 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index a460cf25b4..a0a00a9798 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -656,19 +656,6 @@ class ServerConfig(Config):
             False,
         )
 
-        # List of users trialing the new experimental default push rules. This setting is
-        # not included in the sample configuration file on purpose as it's a temporary
-        # hack, so that some users can trial the new defaults without impacting every
-        # user on the homeserver.
-        users_new_default_push_rules: list = (
-            config.get("users_new_default_push_rules") or []
-        )
-        if not isinstance(users_new_default_push_rules, list):
-            raise ConfigError("'users_new_default_push_rules' must be a list")
-
-        # Turn the list into a set to improve lookup speed.
-        self.users_new_default_push_rules: set = set(users_new_default_push_rules)
-
         # Whitelist of domain names that given next_link parameters must have
         next_link_domain_whitelist: Optional[List[str]] = config.get(
             "next_link_domain_whitelist"