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(Auto Attendance): incorrect previous shift computation for a timestamp leading to incorrect absent marking #1703

Merged
merged 2 commits into from
May 7, 2024

test: prev & curr shift edge cases

ab2f109
Select commit
Loading
Failed to load commit list.
Merged

fix(Auto Attendance): incorrect previous shift computation for a timestamp leading to incorrect absent marking #1703

test: prev & curr shift edge cases
ab2f109
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded May 7, 2024 in 3s

2 rules match and 3 potential rules

⚠️ The pull request has been merged by @ruchamahabal

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

  • #approved-reviews-by>=1
  • #approved-reviews-by>=1 [🛡 GitHub branch protection]
  • -closed [📌 merge requirement]
  • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
  • #commits-behind=0 [🛡 GitHub branch protection]
  • -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
  • #approved-reviews-by>=1 [🛡 GitHub branch protection]
  • -closed [📌 merge requirement]
  • label=squash
  • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
  • #commits-behind=0 [🛡 GitHub branch protection]
  • -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:
    • all of:
      • author!=ruchamahabal
      • author!=frappe-pr-bot
      • author!=mergify[bot]
      • author!=saurabh6790
    • any of:
      • base=version-14
      • base=version-15
      • base=version-16
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