-
Notifications
You must be signed in to change notification settings - Fork 40
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Tracking pull request to merge release-2.18.0 to master (#2860)
* update release number * update pr # * update oc-login * Bump django from 3.2.23 to 3.2.25 in /backend (#2852) 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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * WIP (#2857) * Fix: Remove duplicate BCeID user account #1636 - 2844 (#2853) * update branch bane * update pr number * fix: remove duplicate BCeID user account #1636 --------- Co-authored-by: Kuan Fan <[email protected]> * fix: updated org service calculation for max credit offset to account for credit earning order over time (#2870) Co-authored-by: Your Name <[email protected]> * Fix: Supp report logic - 2867 (#2874) * 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 <[email protected]> * Fix: Summary Null Check (#2875) * 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 <[email protected]> * Fix: Credit Offset Exclude Reserved (#2876) * 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 <[email protected]> * Fix: supp report logic 2867 (#2877) * 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 <[email protected]> * Cleanup 2.18.0 (#2878) * add cleanup * update cleanup bc * update knps for new minio --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kevin-hashimoto <[email protected]> Co-authored-by: Hamed Valiollahi <[email protected]> Co-authored-by: Alex Zorkin <[email protected]> Co-authored-by: Your Name <[email protected]>
- Loading branch information
6 people
committed
Apr 30, 2024
1 parent
73f9402
commit f5cecab
Showing
19 changed files
with
357 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| ## For each release, the value of name, branches, RELEASE_NAME and PR_NUMBER need to be adjusted accordingly | ||
| ## For each release, update lib/config.js: version and releaseBranch | ||
|
|
||
| name: TFRS Dev release-2.17.0 | ||
| name: TFRS Dev release-2.18.0 | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ release-2.17.0 ] | ||
| branches: [ release-2.18.0 ] | ||
| paths: | ||
| - frontend/** | ||
| - backend/** | ||
|
|
@@ -15,8 +15,8 @@ on: | |
| env: | ||
| ## The pull request number of the Tracking pull request to merge the release branch to main | ||
| ## Also remember to update the version in .pipeline/lib/config.js | ||
| PR_NUMBER: 2849 | ||
| RELEASE_NAME: release-2.17.0 | ||
| PR_NUMBER: 2860 | ||
| RELEASE_NAME: release-2.18.0 | ||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.ref }} | ||
|
|
@@ -84,8 +84,7 @@ jobs: | |
|
|
||
| ## Log in to Openshift with a token of service account | ||
| - name: Log in to Openshift | ||
| ##uses: redhat-actions/oc-login@v1 | ||
| uses: smlgbl/oc-login@main | ||
| uses: redhat-actions/[email protected] | ||
| with: | ||
| openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }} | ||
| openshift_token: ${{ secrets.OPENSHIFT_TOKEN }} | ||
|
|
@@ -113,8 +112,7 @@ jobs: | |
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Log in to Openshift | ||
| ##uses: redhat-actions/oc-login@v1 | ||
| uses: smlgbl/oc-login@main | ||
| uses: redhat-actions/[email protected] | ||
| with: | ||
| openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }} | ||
| openshift_token: ${{ secrets.OPENSHIFT_TOKEN }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
backend/api/migrations/0023_delete_duplicate_bceid_account_1636.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| from django.db import migrations | ||
|
|
||
| def delete_user_role(apps, schema_editor): | ||
| """Deletes UserRole objects filtered by user_id=1636.""" | ||
| db_alias = schema_editor.connection.alias | ||
| model = apps.get_model("api", "UserRole") | ||
| model.objects.using(db_alias).filter(user_id=1636).delete() | ||
|
|
||
| def delete_user_creation_request(apps, schema_editor): | ||
| """Deletes UserCreationRequest objects filtered by user_id=1636.""" | ||
| db_alias = schema_editor.connection.alias | ||
| model = apps.get_model("api", "UserCreationRequest") | ||
| model.objects.using(db_alias).filter(user_id=1636).delete() | ||
|
|
||
| def delete_user(apps, schema_editor): | ||
| """Deletes User objects filtered by user_id=1636.""" | ||
| db_alias = schema_editor.connection.alias | ||
| model = apps.get_model("api", "User") | ||
| model.objects.using(db_alias).filter(id=1636).delete() | ||
|
|
||
| class Migration(migrations.Migration): | ||
| """ | ||
| Defines migration dependencies and operations for deleting user data. | ||
| """ | ||
| dependencies = [ | ||
| ('api', '0022_update_trade_effective_dates'), | ||
| ] | ||
|
|
||
| operations = [ | ||
| migrations.RunPython(delete_user_role), | ||
| migrations.RunPython(delete_user_creation_request), | ||
| migrations.RunPython(delete_user), | ||
| ] |
Oops, something went wrong.