Merge branch 'master' into docker-label

eternal-flame-AD · web-flow · commit 0b3a64d3b45f · 2026-03-07T09:30:02.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v6
         with:
-          go-version: 1.25.x
+          go-version: 1.26.x
       - uses: actions/setup-node@v6
         with:
           node-version: '24'
@@ -16,7 +16,7 @@ jobs:
       - run: make build-js
       - uses: golangci/golangci-lint-action@v9
         with:
-          version: v2.4.0
+          version: v2.10.1
           args: --timeout=5m
           skip-cache: true
       - run: go mod download
diff --git a/GO_VERSION b/GO_VERSION
@@ -1 +1 @@
-1.25.1
+1.26.0
diff --git a/database/database.go b/database/database.go
@@ -111,7 +111,7 @@ func fillMissingSortKeys(db *gorm.DB) error {
 	if err := db.Order("user_id, sort_key, id ASC").Find(&apps).Error; err != nil && err != gorm.ErrRecordNotFound {
 		return err
 	}
-	fmt.Println("Migrating", len(apps), "application sort keys for")
+	fmt.Println("Migrating", len(apps), "application sort keys")
 
 	sortKey := ""
 	currentUser := uint(math.MaxUint)
diff --git a/go.mod b/go.mod
@@ -68,4 +68,4 @@ require (
 
 go 1.24.0
 
-toolchain go1.25.1
+toolchain go1.26.0
diff --git a/model/application.go b/model/application.go
@@ -58,5 +58,5 @@ type Application struct {
 	//
 	// required: true
 	// example: a1
-	SortKey string `gorm:"uniqueIndex:uix_application_user_id_sort_key,priority:2" form:"sortKey" query:"sortKey" json:"sortKey"`
+	SortKey string `gorm:"type:bytes;uniqueIndex:uix_application_user_id_sort_key,priority:2,length:255" form:"sortKey" query:"sortKey" json:"sortKey"`
 }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func fillMissingSortKeys(db *gorm.DB) error {`
`111`	`111`	`if err := db.Order("user_id, sort_key, id ASC").Find(&apps).Error; err != nil && err != gorm.ErrRecordNotFound {`
`112`	`112`	`return err`
`113`	`113`	`}`
`114`		`- fmt.Println("Migrating", len(apps), "application sort keys for")`
	`114`	`+ fmt.Println("Migrating", len(apps), "application sort keys")`
`115`	`115`
`116`	`116`	`sortKey := ""`
`117`	`117`	`currentUser := uint(math.MaxUint)`
Original file line number	Diff line number	Diff line change
`@@ -68,4 +68,4 @@ require (`
`68`	`68`
`69`	`69`	`go 1.24.0`
`70`	`70`
`71`		`-toolchain go1.25.1`
	`71`	`+toolchain go1.26.0`
Original file line number	Diff line number	Diff line change
`@@ -58,5 +58,5 @@ type Application struct {`
`58`	`58`	`//`
`59`	`59`	`// required: true`
`60`	`60`	`// example: a1`
`61`		- SortKey string `gorm:"uniqueIndex:uix_application_user_id_sort_key,priority:2" form:"sortKey" query:"sortKey" json:"sortKey"`
	`61`	+ SortKey string `gorm:"type:bytes;uniqueIndex:uix_application_user_id_sort_key,priority:2,length:255" form:"sortKey" query:"sortKey" json:"sortKey"`
`62`	`62`	`}`