Merge branch 'master' into git_simple_pr

Author: a1012112796

models/migrations/migrations.go

@@ -289,6 +289,8 @@ var migrations = []Migration{
 	// v170 -> v171
 	NewMigration("Add Dismissed to Review table", addDismissedReviewColumn),
 	// v171 -> v172
+	NewMigration("Add Sorting to ProjectBoard table", addSortingColToProjectBoard),
+	// v172 -> v173
 	NewMigration("Add agit style pull request support", addAgitStylePullRequest),
 }
 

models/migrations/v171.go

@@ -10,14 +10,12 @@ import (
 	"xorm.io/xorm"
 )
 
-func addAgitStylePullRequest(x *xorm.Engine) error {
-	type PullRequestStyle int
-
-	type PullRequest struct {
-		Style PullRequestStyle
+func addSortingColToProjectBoard(x *xorm.Engine) error {
+	type ProjectBoard struct {
+		Sorting int8 `xorm:"NOT NULL DEFAULT 0"`
 	}
 
-	if err := x.Sync2(new(PullRequest)); err != nil {
+	if err := x.Sync2(new(ProjectBoard)); err != nil {
 		return fmt.Errorf("Sync2: %v", err)
 	}
 	return nil

models/migrations/v172.go

@@ -0,0 +1,24 @@
+// Copyright 2021 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package migrations
+
+import (
+	"fmt"
+
+	"xorm.io/xorm"
+)
+
+func addAgitStylePullRequest(x *xorm.Engine) error {
+	type PullRequestStyle int
+
+	type PullRequest struct {
+		Style PullRequestStyle
+	}
+
+	if err := x.Sync2(new(PullRequest)); err != nil {
+		return fmt.Errorf("Sync2: %v", err)
+	}
+	return nil
+}

models/project_board.go

@@ -36,7 +36,7 @@ type ProjectBoard struct {
 	ID      int64 `xorm:"pk autoincr"`
 	Title   string
 	Default bool `xorm:"NOT NULL DEFAULT false"` // issues not assigned to a specific board will be assigned to this board
-	Sorting int8 `xorm:"DEFAULT 0"`
+	Sorting int8 `xorm:"NOT NULL DEFAULT 0"`
 
 	ProjectID int64 `xorm:"INDEX NOT NULL"`
 	CreatorID int64 `xorm:"NOT NULL"`

routers/api/v1/api.go

@@ -9,7 +9,7 @@
 //
 //     Schemes: http, https
 //     BasePath: /api/v1
-//     Version: 1.1.1
+//     Version: {{AppVer}}
 //     License: MIT http://opensource.org/licenses/MIT
 //
 //     Consumes:

templates/swagger/v1_json.tmpl

@@ -19,7 +19,7 @@
       "name": "MIT",
       "url": "http://opensource.org/licenses/MIT"
     },
-    "version": "1.1.1"
+    "version": "{{AppVer}}"
   },
   "basePath": "{{AppSubUrl}}/api/v1",
   "paths": {