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

refactor: docshare get_users (backport #21924) #21926

Merged
merged 1 commit into from
Aug 5, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 5, 2023

This is an automatic backport of pull request #21924 done by Mergify.
Cherry-pick of 011d21b has failed:

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

You are currently cherry-picking commit 011d21b4a3.
  (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/desk/form/load.py
	both modified:   frappe/share.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.com

@mergify mergify bot requested review from a team and surajshetty3416 and removed request for a team August 5, 2023 04:12
@mergify mergify bot added the conflicts label Aug 5, 2023
@ankush ankush force-pushed the mergify/bp/version-13-hotfix/pr-21924 branch from ca09a64 to 17ed605 Compare August 5, 2023 04:15
@ankush ankush force-pushed the mergify/bp/version-13-hotfix/pr-21924 branch from 17ed605 to 51bdbfd Compare August 5, 2023 04:17
@ankush ankush merged commit 74108da into version-13-hotfix Aug 5, 2023
8 of 9 checks passed
@ankush ankush deleted the mergify/bp/version-13-hotfix/pr-21924 branch August 5, 2023 04:17
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.58.5 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 24, 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

3 participants