env var GITEA_PUSHER_EMAIL (#4516)

* env var GITEA_PUSHER_EMAIL * set pusher email only if email address is not private
go-gitea · Jul 26, 2018 · be4ec0c · be4ec0c
1 parent a847d16
commit be4ec0c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -226,6 +226,11 @@ func HTTP(ctx *context.Context) {
 			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 {