diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-19 18:03:03 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-19 18:03:03 +0000 |
| commit | 1a9551db82d553316d65ad9521d47bbe438db6c4 (patch) | |
| tree | 6015e4155502d34fd8aa35fc32094d8c29981a0a | |
| parent | Bump version, changelog and upgrade.rst (diff) | |
| parent | Fix tests from prev commit (diff) | |
| download | synapse-1a9551db82d553316d65ad9521d47bbe438db6c4.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.5.0
| -rw-r--r-- | synapse/handlers/profile.py | 1 | ||||
| -rw-r--r-- | synapse/handlers/room.py | 3 | ||||
| -rw-r--r-- | tests/rest/test_rooms.py | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py index 834b37f5f3..7853bf5098 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py @@ -202,7 +202,6 @@ class ProfileHandler(BaseHandler): content = { "membership": j.content["membership"], - "prev": j.content["membership"], } yield self.distributor.fire( diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index d09743ed1b..7d9458e1d0 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -364,9 +364,6 @@ class RoomMemberHandler(BaseHandler): target_user_id, event.room_id ) - if prev_state: - event.content["prev"] = prev_state.membership - room_id = event.room_id # If we're trying to join a room then we have to do this differently diff --git a/tests/rest/test_rooms.py b/tests/rest/test_rooms.py index ad3631d510..ff7c9f0530 100644 --- a/tests/rest/test_rooms.py +++ b/tests/rest/test_rooms.py @@ -840,7 +840,6 @@ class RoomMemberStateTestCase(RestTestCase): expected_response = { "membership": Membership.JOIN, - "prev": Membership.JOIN, } self.assertEquals(expected_response, response) |