Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

f40131b4

Commit f40131b4 authored 9 years ago by David Baker

Downloads
- Plain Diff

Merge pull request #627 from matrix-org/dbkr/guest_reuse_send_user_id

Send the user ID matching the guest access token

parents 80916e68 316c0093

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

synapse/api/auth.py 2 additions, 2 deletions

synapse/api/auth.py
synapse/handlers/room.py 5 additions, 0 deletions

synapse/handlers/room.py
tests/rest/client/v1/test_rooms.py 16 additions, 16 deletions

tests/rest/client/v1/test_rooms.py
tests/rest/client/v1/test_typing.py 2 additions, 2 deletions

tests/rest/client/v1/test_typing.py
tests/rest/client/v2_alpha/__init__.py 2 additions, 2 deletions

tests/rest/client/v2_alpha/__init__.py

with 27 additions and 22 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