This repository was archived by the owner on Apr 26, 2024. It is now read-only.
Use OpenID Connect users with existing accounts#8178
Closed
OmmyZhang wants to merge 2 commits intomatrix-org:developfrom
Closed
Use OpenID Connect users with existing accounts#8178OmmyZhang wants to merge 2 commits intomatrix-org:developfrom
OmmyZhang wants to merge 2 commits intomatrix-org:developfrom
Conversation
Member
|
Can you merge develop into this for the conflicts / CI? Thank you! |
Contributor
Author
|
Fine, I need to resolve conflicts at first. |
Member
|
No reason to close this, you can push back to the same branch! |
Contributor
Author
|
@clokep It seems a little complex, as I need to open a PR in BBBSnownball's repository to update this branch. |
Contributor
|
@OmmyZhang I have added you as a collaborator. Please feel free to use my repository or yours - whatever is easier for you. Thanks for continuing this work :-) |
Contributor
Author
|
@BBBSnowball Thanks for your help! This work seems almost done. (pull #8180 ) |
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
fix #7633 and #8155