From 83b1855f559e315143cdd82bc9f028c1302cf9b2 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) (cherry picked from commit dd1c971c6c86ae80323c47084eb724d305428943) (cherry picked from commit 8d2dcd9b1ed055875bdc123aab6bf6ea54539296) (cherry picked from commit b6bb8fd2750c76454cbc014134d3a6049021ca5a) (cherry picked from commit d4b71fe96e043389453a6595ccae0faae0113ca3) (cherry picked from commit e204ec0b2359b85bde65d2b56463dd8e3655405f) (cherry picked from commit 8d9f1174bd568fa8c74e433981b3bf79ba91bfbf) (cherry picked from commit e314a7d5ba2aea572bffe8c69e36cc60ef7663f5) (cherry picked from commit 48b3ad5a303900474ad87014d90889c9fd4a9b9c) (cherry picked from commit 71ed4b7c694ab6ac7e2647274b202f49c9502e0f) (cherry picked from commit d63324ccb647a93c026a5a01ccd79cd73ec8b600) (cherry picked from commit 9249e893dbb096418945a462d35327013f865bbc) (cherry picked from commit 78f156427b6ff2dd6e7dc4092f7ea4e18786cdb0) (cherry picked from commit c3d4a1a602712ff64f152a0c78d2ac438b957dd4) --- 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 86cf2ad280..3385ab83ca 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -553,6 +553,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.