Adding upstream version 9.0.3.

Signed-off-by: Daniel Baumann <daniel@debian.org>

3 files changed, 65 insertions, 0 deletions

diff --git a/models/migrations/v1_7/v73.go b/models/migrations/v1_7/v73.go
new file mode 100644
index 0000000..b5a748a
--- /dev/null
+++ b/models/migrations/v1_7/v73.go
@@ -0,0 +1,18 @@
+// Copyright 2018 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_7 //nolint
+
+import (
+	"xorm.io/xorm"
+)
+
+func AddMustChangePassword(x *xorm.Engine) error {
+	// User see models/user.go
+	type User struct {
+		ID                 int64 `xorm:"pk autoincr"`
+		MustChangePassword bool  `xorm:"NOT NULL DEFAULT false"`
+	}
+
+	return x.Sync(new(User))
+}
diff --git a/models/migrations/v1_7/v74.go b/models/migrations/v1_7/v74.go
new file mode 100644
index 0000000..f0567e3
--- /dev/null
+++ b/models/migrations/v1_7/v74.go
@@ -0,0 +1,15 @@
+// Copyright 2018 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_7 //nolint
+
+import "xorm.io/xorm"
+
+func AddApprovalWhitelistsToProtectedBranches(x *xorm.Engine) error {
+	type ProtectedBranch struct {
+		ApprovalsWhitelistUserIDs []int64 `xorm:"JSON TEXT"`
+		ApprovalsWhitelistTeamIDs []int64 `xorm:"JSON TEXT"`
+		RequiredApprovals         int64   `xorm:"NOT NULL DEFAULT 0"`
+	}
+	return x.Sync(new(ProtectedBranch))
+}
diff --git a/models/migrations/v1_7/v75.go b/models/migrations/v1_7/v75.go
new file mode 100644
index 0000000..fa74309
--- /dev/null
+++ b/models/migrations/v1_7/v75.go
@@ -0,0 +1,32 @@
+// Copyright 2018 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_7 //nolint
+
+import (
+	"xorm.io/builder"
+	"xorm.io/xorm"
+)
+
+func ClearNonusedData(x *xorm.Engine) error {
+	condDelete := func(colName string) builder.Cond {
+		return builder.NotIn(colName, builder.Select("id").From("`user`"))
+	}
+
+	if _, err := x.Exec(builder.Delete(condDelete("uid")).From("team_user")); err != nil {
+		return err
+	}
+
+	if _, err := x.Exec(builder.Delete(condDelete("user_id")).From("collaboration")); err != nil {
+		return err
+	}
+
+	if _, err := x.Exec(builder.Delete(condDelete("user_id")).From("stopwatch")); err != nil {
+		return err
+	}
+
+	if _, err := x.Exec(builder.Delete(condDelete("owner_id")).From("gpg_key")); err != nil {
+		return err
+	}
+	return nil
+}