Merge pull request #4608 from matrix-org/anoa/acls_room_upgrade

Transfer Server ACLs on room upgrade
matrix-org · Feb 12, 2019 · ba3f27b · ba3f27b
2 parents b18cd25 + eff2042
commit ba3f27b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/changelog.d/4608.bugfix b/changelog.d/4608.bugfix
@@ -0,0 +1 @@
+Transfer Server ACLs on room upgrade.
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
@@ -284,6 +284,7 @@ def clone_existing_room(
             (EventTypes.GuestAccess, ""),
             (EventTypes.RoomAvatar, ""),
             (EventTypes.Encryption, ""),
+            (EventTypes.ServerACL, ""),
         )
 
         old_room_state_ids = yield self.store.get_filtered_current_state_ids(