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!: console logs can't be deleted (backport #25369) #25372

Merged
merged 2 commits into from
Mar 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 12, 2024

This is an automatic backport of pull request #25369 done by Mergify.
Cherry-pick of 54a2b08 has failed:

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

You are currently cherry-picking commit 54a2b08278.
  (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/doctype/console_log/console_log.json
	both modified:   frappe/desk/doctype/console_log/console_log.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/pull-requests/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 54a2b08)

# Conflicts:
#	frappe/desk/doctype/console_log/console_log.json
#	frappe/desk/doctype/console_log/console_log.py
@mergify mergify bot requested review from a team and akhilnarang and removed request for a team March 12, 2024 15:22
@mergify mergify bot added the conflicts label Mar 12, 2024
@mergify mergify bot assigned ankush Mar 12, 2024
Copy link
Contributor Author

mergify bot commented Mar 12, 2024

Cherry-pick of 54a2b08 has failed:

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

You are currently cherry-picking commit 54a2b08278.
  (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/doctype/console_log/console_log.json
	both modified:   frappe/desk/doctype/console_log/console_log.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ankush ankush enabled auto-merge (squash) March 12, 2024 16:17
@ankush ankush force-pushed the mergify/bp/version-14-hotfix/pr-25369 branch from 2fd0f66 to 9261d7e Compare March 12, 2024 16:17
@ankush ankush merged commit fee8619 into version-14-hotfix Mar 12, 2024
9 of 12 checks passed
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-25369 branch March 12, 2024 16:34
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.68.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 Apr 4, 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.

None yet

2 participants