From dd1c971c6c86ae80323c47084eb724d305428943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Dachary?= Date: Thu, 16 Feb 2023 10:36:14 +0100 Subject: [PATCH] [BRANDING] reserve forgejo-actions username (cherry picked from commit 2a25be788bdf3b58b236cb2a9f503b569703a0c6) (cherry picked from commit b270d5815c80f387759eecbfcb588e548f5ed956) (cherry picked from commit e7382cc71e43c52abcabc59d09128450ce415d26) (cherry picked from commit 665400ea1e92405f41590bccf800714440ded50a) (cherry picked from commit f5b2c691f17d6a66fd8041a83b36194f7d630339) (cherry picked from commit 3df97adfefac63ddd1d44cc553a2c81087706d47) (cherry picked from commit 494f6eafc15f235cd7ca5d4f01e7ac16eea8bd5b) (cherry picked from commit 822e3d2c833e2a92d337812a93a6c78638b14456) (cherry picked from commit 7460f1256852256048e7a7eb1dad108a0caa3567) (cherry picked from commit f6cd70881e828688a73f277252cdf1bf1904fbe2) (cherry picked from commit c669ce8173f0f819834436fd571d25c8678ec187) (cherry picked from commit 1d5a433e0282681c6ebcd9ee0cb5deb644509f7d) (cherry picked from commit c1a4dc150c617a8210c5907e9d93e41f01a01a2f) --- models/user/user.go | 1 + models/user/user_system.go | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/models/user/user.go b/models/user/user.go index 0be36e69ab..f64ff86a37 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -542,6 +542,7 @@ var ( "user", "v2", "gitea-actions", + "forgejo-actions", } // DON'T ADD ANY NEW STUFF, WE SOLVE THIS WITH `/user/{obj}` PATHS! diff --git a/models/user/user_system.go b/models/user/user_system.go index f54f4e3ffb..e3f79a4baf 100644 --- a/models/user/user_system.go +++ b/models/user/user_system.go @@ -37,9 +37,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.