Merge branch 'main' into laurent/env-vars

kurtosis-tech · Aug 26, 2024 · 9792d17 · 9792d17
2 parents 9813bd8 + 3d0d2da
commit 9792d17
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.1.21](https://github.com/kurtosis-tech/kardinal-kontrol/compare/0.1.20...0.1.21) (2024-08-26)
+
+
+### Miscellaneous Chores
+
+* release 0.1.21 ([ae515ae](https://github.com/kurtosis-tech/kardinal-kontrol/commit/ae515aeff9762d38987e75a0e8018121e422eb5a))
+
 ## 0.1.20 (2024-08-24)
 
 

diff --git a/kontrol-service/database/tenant.go b/kontrol-service/database/tenant.go
@@ -46,7 +46,7 @@ func (db *Db) GetTenant(
 	tenantId string,
 ) (*Tenant, error) {
 	var tenant Tenant
-	result := db.db.Where("tenant_id = ?", tenantId).First(&tenant)
+	result := db.db.Where("tenant_id = ?", tenantId).Preload("Flows").Preload("Templates").First(&tenant)
 	if result.Error != nil {
 		if result.Error == gorm.ErrRecordNotFound {
 			return nil, nil

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.1.20
+0.1.21