From 08d9f6f9752c4be05860aece7264123438154d81 Mon Sep 17 00:00:00 2001 From: Lukas Treyer Date: Thu, 26 Jul 2018 10:48:56 +0200 Subject: [PATCH 1/2] env var GITEA_PUSHER_EMAIL --- models/update.go | 1 + routers/repo/http.go | 1 + 2 files changed, 2 insertions(+) diff --git a/models/update.go b/models/update.go index b1bbe0754a3b7..0f71cd1e709a6 100644 --- a/models/update.go +++ b/models/update.go @@ -23,6 +23,7 @@ const ( EnvRepoUsername = "GITEA_REPO_USER_NAME" EnvRepoIsWiki = "GITEA_REPO_IS_WIKI" EnvPusherName = "GITEA_PUSHER_NAME" + EnvPusherEmail = "GITEA_PUSHER_EMAIL" EnvPusherID = "GITEA_PUSHER_ID" ) diff --git a/routers/repo/http.go b/routers/repo/http.go index e4e26e4f09ee6..ff1a20bdff5b4 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -223,6 +223,7 @@ func HTTP(ctx *context.Context) { models.EnvRepoUsername + "=" + username, models.EnvRepoName + "=" + reponame, models.EnvPusherName + "=" + authUser.Name, + models.EnvPusherEmail + "=" + authUser.Email, models.EnvPusherID + fmt.Sprintf("=%d", authUser.ID), models.ProtectedBranchRepoID + fmt.Sprintf("=%d", repo.ID), } From 2f8f0763237d556666cd04c6b586422cb1536420 Mon Sep 17 00:00:00 2001 From: Lukas Treyer Date: Thu, 26 Jul 2018 12:33:05 +0200 Subject: [PATCH 2/2] set pusher email only if email address is not private --- routers/repo/http.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/routers/repo/http.go b/routers/repo/http.go index ff1a20bdff5b4..1c3453a3a9827 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -223,10 +223,14 @@ func HTTP(ctx *context.Context) { models.EnvRepoUsername + "=" + username, models.EnvRepoName + "=" + reponame, models.EnvPusherName + "=" + authUser.Name, - models.EnvPusherEmail + "=" + authUser.Email, models.EnvPusherID + fmt.Sprintf("=%d", authUser.ID), models.ProtectedBranchRepoID + fmt.Sprintf("=%d", repo.ID), } + + if !authUser.KeepEmailPrivate { + environ = append(environ, models.EnvPusherEmail+"="+authUser.Email) + } + if isWiki { environ = append(environ, models.EnvRepoIsWiki+"=true") } else {