Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

01e6b405

Unverified Commit 01e6b405 authored 6 years ago by Erik Johnston Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_rooms

Deny peeking into rooms that have been blocked

parents ab4e4c6c 27813b4c

Branches

Tags

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/4908.bugfix 1 addition, 0 deletions

changelog.d/4908.bugfix
synapse/handlers/events.py 6 additions, 1 deletion

synapse/handlers/events.py
synapse/handlers/initial_sync.py 5 additions, 1 deletion

synapse/handlers/initial_sync.py
tests/rest/client/v1/test_admin.py 65 additions, 1 deletion

tests/rest/client/v1/test_admin.py

with 77 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment