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: project query controller logic (backport #39402) #39411

Merged
merged 4 commits into from
Jan 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 16, 2024

This is an automatic backport of pull request #39402 done by Mergify.
Cherry-pick of 4eefb44 has failed:

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

You are currently cherry-picking commit 4eefb445a7.
  (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/controllers/queries.py

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

Cherry-pick of bfe42fd has failed:

On branch mergify/bp/version-14-hotfix/pr-39402
Your branch is ahead of 'origin/version-14-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit bfe42fdccb.
  (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/controllers/queries.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

(cherry picked from commit 4eefb44)

# Conflicts:
#	erpnext/controllers/queries.py
(cherry picked from commit bfe42fd)

# Conflicts:
#	erpnext/controllers/queries.py
@ruthra-kumar ruthra-kumar merged commit 5693979 into version-14-hotfix Jan 17, 2024
10 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-14-hotfix/pr-39402 branch January 17, 2024 05:27
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.61.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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

Successfully merging this pull request may close these issues.

2 participants