From 8c96d6a9db86492ca47a7b7616cd0749675d936c Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 18 Jan 2021 18:33:57 +0100
Subject: [PATCH 1/2] Fix mig 141

---
 models/migrations/v141.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/migrations/v141.go b/models/migrations/v141.go
index b5824ecd48db2..ab05698b8cb5d 100644
--- a/models/migrations/v141.go
+++ b/models/migrations/v141.go
@@ -12,7 +12,7 @@ import (
 
 func addKeepActivityPrivateUserColumn(x *xorm.Engine) error {
 	type User struct {
-		KeepActivityPrivate bool
+		KeepActivityPrivate bool `xorm:"NOT NULL DEFAULT false"`
 	}
 
 	if err := x.Sync2(new(User)); err != nil {

From debbb5b70caa9244b75cc4632c78dd58928f2528 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Wed, 20 Jan 2021 17:08:32 +0100
Subject: [PATCH 2/2] temporary fix dump

---
 models/models.go | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/models/models.go b/models/models.go
index f12a4e8b304ca..4e3d1b8ff6291 100644
--- a/models/models.go
+++ b/models/models.go
@@ -15,12 +15,14 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 
-	// Needed for the MySQL driver
-	_ "github.com/go-sql-driver/mysql"
+	"xorm.io/builder"
 	"xorm.io/xorm"
 	"xorm.io/xorm/names"
 	"xorm.io/xorm/schemas"
 
+	// Needed for the MySQL driver
+	_ "github.com/go-sql-driver/mysql"
+
 	// Needed for the Postgresql driver
 	_ "github.com/lib/pq"
 
@@ -312,6 +314,13 @@ func DumpDatabase(filePath string, dbType string) error {
 		tbs = append(tbs, t)
 	}
 
+	// temporary fix for v1.13.x (https://github.com/go-gitea/gitea/issues/14069)
+	if _, err := x.Where(builder.IsNull{"keep_activity_private"}).
+		Cols("keep_activity_private").
+		Update(User{KeepActivityPrivate: false}); err != nil {
+		return err
+	}
+
 	type Version struct {
 		ID      int64 `xorm:"pk autoincr"`
 		Version int64