Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

b6681123

Commit b6681123 authored 7 years ago by Erik Johnston Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #2296 from matrix-org/erikj/dont_appserver_shar

Don't work out users who share room with appservice users

parents 71995e13 dae9a00a

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

synapse/app/user_dir.py 1 addition, 1 deletion

synapse/app/user_dir.py
synapse/handlers/user_directory.py 11 additions, 2 deletions

synapse/handlers/user_directory.py
synapse/replication/slave/storage/appservice.py 5 additions, 0 deletions

synapse/replication/slave/storage/appservice.py
synapse/storage/appservice.py 20 additions, 15 deletions

synapse/storage/appservice.py

with 37 additions and 18 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