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

Tracking pull request to merge release-2.18.0 to master #2860

Merged
merged 13 commits into from
Apr 30, 2024

Conversation

kuanfandevops
Copy link
Collaborator

No description provided.

@kuanfandevops kuanfandevops changed the base branch from main to master March 22, 2024 17:58
kuanfandevops and others added 11 commits March 22, 2024 14:00
Bumps [django](https://github.com/django/django) from 3.2.23 to 3.2.25.
- [Commits](django/django@3.2.23...3.2.25)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* update branch bane

* update pr number

* fix: remove duplicate BCeID user account #1636

---------

Co-authored-by: Kuan Fan <kuan.fan@gov.bc.ca>
… for credit earning order over time (#2870)

Co-authored-by: Your Name <you@example.com>
* fix: updated org service calculation for max credit offset to account for credit earning order over time

* fix: pending deductions calc change

---------

Co-authored-by: Your Name <you@example.com>
* fix: updated org service calculation for max credit offset to account for credit earning order over time

* fix: pending deductions calc change

* fix: None check on summary obj

---------

Co-authored-by: Your Name <you@example.com>
* fix: updated org service calculation for max credit offset to account for credit earning order over time

* fix: pending deductions calc change

* fix: None check on summary obj

* fix: added back exclude reserved

---------

Co-authored-by: Your Name <you@example.com>
* fix: updated org service calculation for max credit offset to account for credit earning order over time

* fix: pending deductions calc change

* fix: None check on summary obj

* fix: added back exclude reserved

* fix: test for ignoring pending supplemental deductions

---------

Co-authored-by: Your Name <you@example.com>
* add cleanup

* update cleanup bc
@kuanfandevops kuanfandevops merged commit f5cecab into master Apr 30, 2024
5 of 6 checks passed
@kuanfandevops kuanfandevops deleted the release-2.18.0 branch April 30, 2024 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants