Merge branch 'develop' of github.com:matrix-org/synapse into erikj/power_level_sanity

1 files changed, 2 insertions, 1 deletions

diff --git a/synapse/api/auth.py b/synapse/api/auth.py

index ee52ff66d4..487be7ce9c 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -29,7 +29,7 @@ logger = logging.getLogger(__name__)
 
 AuthEventTypes = (
     EventTypes.Create, EventTypes.Member, EventTypes.PowerLevels,
-    EventTypes.JoinRules,
+    EventTypes.JoinRules, EventTypes.RoomHistoryVisibility,
 )
 
 
@@ -578,6 +578,7 @@ class Auth(object):
         levels_to_check = [
             ("users_default", None),
             ("events_default", None),
+            ("state_default", None),
             ("ban", None),
             ("redact", None),
             ("kick", None),