Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.5.0
This commit is contained in:
commit
1a9551db82
3 changed files with 0 additions and 5 deletions
|
@ -202,7 +202,6 @@ class ProfileHandler(BaseHandler):
|
|||
|
||||
content = {
|
||||
"membership": j.content["membership"],
|
||||
"prev": j.content["membership"],
|
||||
}
|
||||
|
||||
yield self.distributor.fire(
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -840,7 +840,6 @@ class RoomMemberStateTestCase(RestTestCase):
|
|||
|
||||
expected_response = {
|
||||
"membership": Membership.JOIN,
|
||||
"prev": Membership.JOIN,
|
||||
}
|
||||
self.assertEquals(expected_response, response)
|
||||
|
||||
|
|
Loading…
Reference in a new issue