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: Apply address all perm only if owner (backport #22696) #22697

Merged
merged 1 commit into from
Oct 11, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 11, 2023

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

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

You are currently cherry-picking commit bac5f76247.
  (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:   frappe/contacts/doctype/address/address.json

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.com

@mergify mergify bot requested a review from a team October 11, 2023 06:22
@mergify mergify bot added the conflicts label Oct 11, 2023
@mergify mergify bot requested review from ankush and removed request for a team October 11, 2023 06:23
@mergify mergify bot assigned ankush Oct 11, 2023
@ankush ankush force-pushed the mergify/bp/version-13-hotfix/pr-22696 branch from a4c1c93 to f6105df Compare October 11, 2023 06:27
@ankush ankush merged commit 0270846 into version-13-hotfix Oct 11, 2023
8 of 9 checks passed
@ankush ankush deleted the mergify/bp/version-13-hotfix/pr-22696 branch October 11, 2023 06:28
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.58.13 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants