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

MERGING release/23.10 into main #53

Merged
merged 17 commits into from
Jan 16, 2024
Merged

MERGING release/23.10 into main #53

merged 17 commits into from
Jan 16, 2024

Conversation

delcroip
Copy link
Member

MERGING release/23.10 into main

malinowskikam and others added 17 commits July 10, 2023 15:40
CM-188 Adjusted backend for social protection
CM-256: Add sonar-project.properties
The contribution plan migrations refer to the calculationrules model that is then deleted.
We need to ensure that these operations are executed in the right order, i.e. deleting the model only after the contribution plan doesn't need it anymore.

This shouldn't affect the development branch that has squashed commits and other operations. It also won't break the upgrade as the migrations themselves are the same, only the dependency tree.
CI Update for openimis-be-calculation_py
* CI update

* CI Update 2

---------

Co-authored-by: Damian Borowiecki <[email protected]>
Co-authored-by: Jan <[email protected]>
MERGING RELEASE branches
…les_contrib_plan

OP-1557 Add dependency for contribution plan
MERGING develop into release/23.10
@hirensoni913 hirensoni913 merged commit 546cb34 into main Jan 16, 2024
4 of 12 checks passed
@hirensoni913 hirensoni913 deleted the release/23.10 branch January 16, 2024 07:45
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.

7 participants