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: Check if note has permission (backport #22750) #22751

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 16, 2023

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

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

You are currently cherry-picking commit db3e4c9cfc.
  (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)

Changes to be committed:
	modified:   frappe/hooks.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/desk/doctype/note/note.py

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

(cherry picked from commit db3e4c9)

# Conflicts:
#	frappe/desk/doctype/note/note.py
@mergify mergify bot requested review from a team and removed request for a team October 16, 2023 11:14
@mergify mergify bot added the conflicts label Oct 16, 2023
@mergify mergify bot requested a review from maharshivpatel October 16, 2023 11:14
@mergify mergify bot assigned ankush Oct 16, 2023
@ankush ankush closed this Oct 16, 2023
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-22750 branch October 16, 2023 12:11
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 31, 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.

1 participant