hostsharing
/
hs.hsadmin.ng
7
0
Fork 0
Code Pull Requests 1 Activity

spring-boot-3-2-upgrade #32

Merged
hsh-michaelhoennig merged 18 commits from spring-boot-3-2-upgrade into master 2024-04-02 13:24:25 +02:00
Conversation 0 Commits 18 Files Changed 25 +62 -198
hsh-michaelhoennig commented 2024-04-02 13:16:11 +02:00
Member
Copy Link
No description provided.
hsh-michaelhoennig added 17 commits 2024-04-02 13:16:12 +02:00
3107bd33cc Merge remote-tracking branch 'origin/master' into spring-boot-3-2-upgrade 
# Conflicts:
#	README.md
#	doc/rbac.md
#	src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntity.java
#	src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java
#	src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntity.java
#	src/main/resources/api-definition/rbac/rbac-role-schemas.yaml
#	src/main/resources/db/changelog/1-rbac/1050-rbac-base.sql
#	src/main/resources/db/changelog/1-rbac/1058-rbac-generators.sql
#	src/main/resources/db/changelog/1-rbac/1080-rbac-global.sql
#	src/main/resources/db/changelog/5-hs-office/510-membership/5103-hs-office-membership-rbac.md
#	src/main/resources/db/changelog/5-hs-office/510-membership/5103-hs-office-membership-rbac.sql
#	src/main/resources/db/changelog/5-hs-office/511-coopshares/5113-hs-office-coopshares-rbac.md
#	src/main/resources/db/changelog/5-hs-office/511-coopshares/5113-hs-office-coopshares-rbac.sql
#	src/main/resources/db/changelog/5-hs-office/512-coopassets/5123-hs-office-coopassets-rbac.md
#	src/main/resources/db/changelog/5-hs-office/512-coopassets/5123-hs-office-coopassets-rbac.sql
#	src/test/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionRepositoryIntegrationTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionRepositoryIntegrationTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipControllerAcceptanceTest.java
#	src/test/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipRepositoryIntegrationTest.java
#	src/test/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantControllerAcceptanceTest.java
#	src/test/java/net/hostsharing/hsadminng/rbac/rbacrole/TestRbacRole.java
97c67d8f97 Merge remote-tracking branch 'origin/master' into spring-boot-3-2-upgrade 
# Conflicts:
#	src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntity.java
#	src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java
hsh-timotheuspokorra approved these changes 2024-04-02 13:23:06 +02:00
hsh-timotheuspokorra left a comment
Member
Copy Link

sieht gut aus

sieht gut aus
hsh-michaelhoennig added 1 commit 2024-04-02 13:23:27 +02:00
hsh-michaelhoennig merged commit 73c378b456 into master 2024-04-02 13:24:25 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
hsh-timotheuspokorra
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: hostsharing/hs.hsadmin.ng#32
No description provided.
Delete Branch "spring-boot-3-2-upgrade"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?