Skip to content

env var GITEA_PUSHER_EMAIL #4516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 26, 2018
Merged

env var GITEA_PUSHER_EMAIL #4516

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08d9f6f
env var GITEA_PUSHER_EMAIL
treyerl Jul 26, 2018
fa54a31
Merge branch 'master' into master
lafriks Jul 26, 2018
2f8f076
set pusher email only if email address is not private
treyerl Jul 26, 2018
fe153be
Merge branch 'master' of github.com:treyerl/gitea
treyerl Jul 26, 2018
b7d9573
Merge branch 'master' into master
lafriks Jul 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions models/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
5 changes: 5 additions & 0 deletions routers/repo/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down