Merge branch 'rebase-v1.21/forgejo-branding' into wip-v1.21-forgejo

models/fixtures/repo_unit.yml

@@ -681,3 +681,23 @@
   repo_id: 49
   type: 2
   created_unix: 946684810
+
+-
+  id: 98
+  repo_id: 1
+  type: 8
+  created_unix: 946684810
+
+-
+  id: 99
+  repo_id: 1
+  type: 9
+  config: "{}"
+  created_unix: 946684810
+
+-
+  id: 100
+  repo_id: 1
+  type: 10
+  config: "{}"
+  created_unix: 946684810

models/migrations/migrations.go

@@ -584,7 +584,7 @@ func EnsureUpToDate(x *xorm.Engine) error {
 	expected := ExpectedVersion()
 
 	if currentDB != expected {
-		return fmt.Errorf(`Current database version %d is not equal to the expected version %d. Please run "gitea [--config /path/to/app.ini] migrate" to update the database version`, currentDB, expected)
+		return fmt.Errorf(`Current database version %d is not equal to the expected version %d. Please run "forgejo [--config /path/to/app.ini] migrate" to update the database version`, currentDB, expected)
 	}
 
 	return nil

models/user/user.go

@@ -564,6 +564,7 @@ var (
 		"user",
 		"v2",
 		"gitea-actions",
+		"forgejo-actions",
 	}
 
 	// DON'T ADD ANY NEW STUFF, WE SOLVE THIS WITH `/user/{obj}` PATHS!

models/user/user_system.go

@@ -39,9 +39,9 @@ func NewReplaceUser(name string) *User {
 
 const (
 	ActionsUserID   = -2
-	ActionsUserName = "gitea-actions"
-	ActionsFullName = "Gitea Actions"
-	ActionsEmail    = "teabot@gitea.io"
+	ActionsUserName = "forgejo-actions"
+	ActionsFullName = "Forgejo Actions"
+	ActionsEmail    = "noreply@forgejo.org"
 )
 
 // NewActionsUser creates and returns a fake user for running the actions.