Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Port "Fix 3PID invite room state over federation" to dinsic #5471

Merged
merged 3 commits into from
Jun 17, 2019

Conversation

babolivier
Copy link
Contributor

Port of #5464 to the dinsic branch

neilisfragile and others added 3 commits June 13, 2019 16:42
because this file is reproduced on dockerhub and relative paths don't work
Fixes that when a user exchanges a 3PID invite for a proper invite over
federation it does not include the `invite_room_state` key.

This was due to synapse incorrectly sending out two invite requests.
@codecov
Copy link

codecov bot commented Jun 17, 2019

Codecov Report

❗ No coverage uploaded for pull request base (dinsic@5c4296b). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             dinsic    #5471   +/-   ##
=========================================
  Coverage          ?   63.08%           
=========================================
  Files             ?      326           
  Lines             ?    35665           
  Branches          ?     5852           
=========================================
  Hits              ?    22500           
  Misses            ?    11587           
  Partials          ?     1578

@babolivier babolivier force-pushed the erikj/3pid_remote_invite_state branch from 1391578 to 3c9bb86 Compare June 17, 2019 10:42
@babolivier babolivier merged commit 40ea934 into dinsic Jun 17, 2019
@babolivier babolivier deleted the erikj/3pid_remote_invite_state branch September 27, 2019 09:45
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants