Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport] Avoid guest creation modal if a user is suggested in the share search #604

Conversation

julien-nc
Copy link
Member

This is a backport of #554
Tested on NC 20.

@julien-nc julien-nc added the 3. to review Waiting for reviews label Apr 30, 2021
@julien-nc
Copy link
Member Author

Or would it be better to ask the backport-bot in the original PR?

@juliushaertl
Copy link
Member

The backport bot would not help much as the conflict would occur here as well. Mind to resolve? Otherwise 👍

@julien-nc julien-nc force-pushed the enh/stable-1.6-avoid-guest-creation-for-existing-email branch from 9953c7d to ad3cc3a Compare May 10, 2021 10:19
@julien-nc julien-nc changed the base branch from master to stable-1.6 May 10, 2021 10:20
…are search

Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
@julien-nc julien-nc force-pushed the enh/stable-1.6-avoid-guest-creation-for-existing-email branch from ad3cc3a to 48732dc Compare May 10, 2021 10:21
@julien-nc
Copy link
Member Author

@juliushaertl Yeah there was actually no conflict, I just tried to merge with master instead of stable-1.6... 😁

@juliushaertl juliushaertl merged commit f16ee93 into stable-1.6 May 11, 2021
@juliushaertl juliushaertl deleted the enh/stable-1.6-avoid-guest-creation-for-existing-email branch May 11, 2021 09:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants