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: index collect_progress and project date (backport #35920) #36374

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 28, 2023

This is an automatic backport of pull request #35920 done by Mergify.
Cherry-pick of 9e1736e has failed:

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

You are currently cherry-picking commit 9e1736e027.
  (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:   erpnext/projects/doctype/project_update/project_update.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/projects/doctype/project/project.json

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

There's background job to send progress update, this ends up scanning
entire table.

(cherry picked from commit 9e1736e)

# Conflicts:
#	erpnext/projects/doctype/project/project.json
@mergify mergify bot added the conflicts label Jul 28, 2023
@mergify mergify bot assigned ankush Jul 28, 2023
@ankush ankush closed this Jul 28, 2023
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-35920 branch July 28, 2023 07:25
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 12, 2024
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