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

fix: Avoid automatic customer creation on website user login (backport #27914) #27926

Merged
merged 3 commits into from
Oct 27, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 12, 2021

This is an automatic backport of pull request #27914 done by Mergify.
Cherry-pick of d824a90 has failed:

On branch mergify/bp/version-13-hotfix/pr-27914
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit d824a90fac.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/e_commerce/shopping_cart/utils.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

(cherry picked from commit d824a90)

# Conflicts:
#	erpnext/e_commerce/shopping_cart/utils.py
- Moved return to next line
- Space between function import and body

(cherry picked from commit a780f78)
@marination marination self-assigned this Oct 12, 2021
@stale
Copy link

stale bot commented Oct 27, 2021

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within a week if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

@stale stale bot added the inactive label Oct 27, 2021
@marination marination merged commit 5388ecf into version-13-hotfix Oct 27, 2021
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-27914 branch October 27, 2021 18:37
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
…fix/pr-27914

fix: Avoid automatic customer creation on website user login (backport frappe#27914)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant