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

feat: let users modify hook resolution order (backport #19653) #19774

Merged
merged 4 commits into from
Jan 25, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 25, 2023

This is an automatic backport of pull request #19653 done by Mergify.
Cherry-pick of 1796cae has failed:

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

You are currently cherry-picking commit 1796cae6bf.
  (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/core/doctype/installed_applications/installed_applications.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/installed_applications/installed_applications.js
	both modified:   frappe/core/doctype/installed_applications/test_installed_applications.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

Since hook resolution depends on the order in which apps were installed
on site, it should be made configurable as escape hatch in case a
different resolution order is desired.

Keep in mind that changing order affects every hook, page, customization
so you can't pick and choose priority for individual hooks as of now.

Separate proposals are welcome for such configurabilty.

(cherry picked from commit 1796cae)

# Conflicts:
#	frappe/core/doctype/installed_applications/installed_applications.js
#	frappe/core/doctype/installed_applications/test_installed_applications.py
@mergify mergify bot requested a review from a team as a code owner January 25, 2023 07:23
@mergify mergify bot requested review from phot0n and removed request for a team January 25, 2023 07:23
@mergify mergify bot added the conflicts label Jan 25, 2023
@mergify mergify bot assigned ankush Jan 25, 2023
ankush and others added 2 commits January 25, 2023 12:57
[skip ci]

Co-Authored-By: Suraj Shetty <surajshetty3416@gmail.com>

Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
@ankush ankush removed the conflicts label Jan 25, 2023
@ankush ankush merged commit 76e0974 into version-13-hotfix Jan 25, 2023
@ankush ankush deleted the mergify/bp/version-13-hotfix/pr-19653 branch January 25, 2023 07:31
frappe-pr-bot pushed a commit that referenced this pull request Jan 30, 2023
# [13.49.0](v13.48.0...v13.49.0) (2023-01-30)

### Bug Fixes

* add freeze message for bulk delete ([486df4c](486df4c))
* **i18n:** Datepicker Turkish translations ([#19777](#19777)) ([#19830](#19830)) ([5ba34b4](5ba34b4))
* incorrect link when std field has problem (backport [#19744](#19744)) ([#19764](#19764)) ([30729a2](30729a2))
* **MariaDBTable:** dont attempt to drop index twice ([#19783](#19783)) ([#19801](#19801)) ([1b94c62](1b94c62))
* use count instead of concatenated docnames ([d8d7373](d8d7373))

### Features

* Audit hooks report (backport [#19780](#19780)) ([#19827](#19827)) ([361e250](361e250))
* better freeze message ([7f46807](7f46807))
* let users modify hook resolution order (backport [#19653](#19653)) ([#19774](#19774)) ([76e0974](76e0974)), closes [#19672](#19672)
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.49.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 14, 2023
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.

None yet

2 participants