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: gratuity calculation for 'Sum of all previous slabs' option #2471

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from

Merge branch 'develop' into fix-gratuity-calculation

1890d4e
Select commit
Loading
Failed to load commit list.
Open

fix: gratuity calculation for 'Sum of all previous slabs' option #2471

Merge branch 'develop' into fix-gratuity-calculation
1890d4e
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Dec 6, 2024 in 0s

5 potential rules

Rule: Automatic merge on CI success and review (merge)

  • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
  • #approved-reviews-by>=1
  • #commits-behind = 0 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • -closed [📌 merge requirement]
  • -conflict [📌 merge requirement]
  • -draft [📌 merge requirement]
  • label!=dont-merge
  • label!=squash
  • any of: [📌 merge -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed
  • any of: [🛡 GitHub branch protection]
    • check-success = build
    • check-neutral = build
    • check-skipped = build
  • any of: [🛡 GitHub branch protection]
    • check-success = Frappe Linter
    • check-neutral = Frappe Linter
    • check-skipped = Frappe Linter

Rule: Automatic squash on CI success and review (merge)

  • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
  • #approved-reviews-by>=1
  • #commits-behind = 0 [🛡 GitHub branch protection]
  • label=squash
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • -closed [📌 merge requirement]
  • -conflict [📌 merge requirement]
  • -draft [📌 merge requirement]
  • label!=dont-merge
  • any of: [📌 merge -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed
  • any of: [🛡 GitHub branch protection]
    • check-success = build
    • check-neutral = build
    • check-skipped = build
  • any of: [🛡 GitHub branch protection]
    • check-success = Frappe Linter
    • check-neutral = Frappe Linter
    • check-skipped = Frappe Linter

Rule: backport to develop (backport)

  • label="backport develop"
  • merged [📌 backport requirement]

Rule: backport to version-14-hotfix (backport)

  • label="backport version-14-hotfix"
  • merged [📌 backport requirement]

Rule: backport to version-15-hotfix (backport)

  • label="backport version-15-hotfix"
  • merged [📌 backport requirement]

💖  Mergify is proud to provide this service for free to open source projects.

🚀  You can help us by becoming a sponsor!


1 not applicable rule

Rule: Auto-close PRs on stable branch (close, comment)

  • all of:
    • any of:
      • base=version-14
      • base=version-15
      • base=version-16
    • all of:
      • author!=frappe-pr-bot
      • author!=mergify[bot]
      • author!=ruchamahabal
      • author!=saurabh6790
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