This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
Merge develop -> experimental #2441
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes element-hq/element-web#7922 This supports the current style of errors (M_NOT_FOUND) as well as the errors presented by MSC1797: matrix-org/matrix-spec-proposals#1797
Also handle profile errors better
Give a route for retrying invites for users which may not exist
|
2/3 test failures are expected as they are inherited from the develop branch being not-great at the moment. |
So the failures would carry over to experimental when merged, or they are specific to develop? |
|
They are specific to develop. The Jenkins one happens to be on the last commit, and the |
jryans
approved these changes
Jan 14, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Looks like the merge is smart enough and really only includes #2434