Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

7d0981b3

Commit 7d0981b3 authored 8 years ago by Erik Johnston Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #1787 from matrix-org/erikj/linearize_member

Linearize updates to membership via PUT /state/

parents 07c3c08f 6823fe52

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

synapse/handlers/room_member.py 15 additions, 4 deletions

synapse/handlers/room_member.py
synapse/rest/client/v1/room.py 17 additions, 11 deletions

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

tests/rest/client/v1/test_rooms.py
tests/rest/client/v1/utils.py 4 additions, 1 deletion

tests/rest/client/v1/utils.py

with 38 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