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.

Sign up for GitHub

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

merge #75

Merged
merged 9 commits into from
Jul 18, 2024
+2 −0
Merged

merge #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
92185e0
Merge pull request #53 from Onlineberatung/DIAKONIE-352-merge-tenant-…
tkuzynow Jul 18, 2024
3089965
fix: merge tenants
tkuzynow Jul 18, 2024
bfb6681
fix: merge tenants
tkuzynow Jul 18, 2024
1e9b285
chore: merge logic
tkuzynow Jul 18, 2024
37f2bac
Merge pull request #54 from Onlineberatung/DIAKONIE-352-merge-tenant-…
tkuzynow Jul 18, 2024
e6447a5
chore: merge logic
tkuzynow Jul 18, 2024
9d047ce
Merge pull request #55 from Onlineberatung/DIAKONIE-352-merge-tenant-…
tkuzynow Jul 18, 2024
a7e9434
Merge branch 'develop' into develop
tkuzynow Jul 18, 2024
400d659
Merge pull request #74 from Onlineberatung/develop
tkuzynow Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ weblate.config.api-key=
weblate.config.web=
weblate.config.use.custom.resources.path=false
weblate.config.custom.resources.path=
spring.main.allow-circular-references=true
1 change: 1 addition & 0 deletions src/main/resources/migrations/master-diakonie.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
<include file="migrations/changeset/0023_create_jitsi_technical_user/0023_create_jitsi_technical_user.xml"/>
<include file="migrations/changeset/0024_create_weblate_project/0024_create_weblate_project.xml"/>
<include file="migrations/changeset/0028_fix_consultant_and_user_tenant_id_in_keycloak_based_on_consultant_agency_tenant_id/0028_fix_consultant_and_user_tenant_id_in_keycloak_based_on_consultant_agency_tenant_id.xml"/>
<include file="migrations/changeset/0029_merge_tenants/0029_merge_tenants.xml"/>
</databaseChangeLog>
Loading