Merge branch 'main' into rb-fixes

goharbor · Sep 18, 2023 · 0bb0fe3 · 0bb0fe3
2 parents ea95439 + 26a4f6e
commit 0bb0fe3
Show file tree

Hide file tree

Showing 37 changed files with 72 additions and 845 deletions.
diff --git a/make/migrations/postgresql/0130_2.10.0_schema.up.sql b/make/migrations/postgresql/0130_2.10.0_schema.up.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS harbor_resource_label;
diff --git a/src/common/dao/resource_label.go b/src/common/dao/resource_label.go
diff --git a/src/common/dao/resource_label_test.go b/src/common/dao/resource_label_test.go
diff --git a/src/common/models/base.go b/src/common/models/base.go
@@ -21,7 +21,6 @@ import (
 func init() {
 	orm.RegisterModel(
 		new(Role),
-		new(ResourceLabel),
 		new(OIDCUser),
 	)
 }
diff --git a/src/common/models/label.go b/src/common/models/label.go
diff --git a/src/common/models/label_test.go b/src/common/models/label_test.go