From d257485bc0026c9717fe7bf4c9953ad1b7a1a9ae Mon Sep 17 00:00:00 2001 From: zeripath Date: Sun, 30 Aug 2020 08:24:39 +0100 Subject: Rename models.ProtectedBranchRepoID to models.EnvRepoID and ensure EnvPusherEmail is set (#12646) Signed-off-by: Andrew Thornton --- routers/private/serv.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'routers/private') diff --git a/routers/private/serv.go b/routers/private/serv.go index 2e79fd79ac..f463ff6828 100644 --- a/routers/private/serv.go +++ b/routers/private/serv.go @@ -217,6 +217,18 @@ func ServCommand(ctx *macaron.Context) { // so for now use the owner of the repository results.UserName = results.OwnerName results.UserID = repo.OwnerID + if err = repo.GetOwner(); err != nil { + log.Error("Unable to get owner for repo %-v. Error: %v", repo, err) + ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ + "results": results, + "type": "InternalServerError", + "err": fmt.Sprintf("Unable to get owner for repo: %s/%s.", results.OwnerName, results.RepoName), + }) + return + } + if !repo.Owner.KeepEmailPrivate { + results.UserEmail = repo.Owner.Email + } } else { // Get the user represented by the Key var err error @@ -239,6 +251,9 @@ func ServCommand(ctx *macaron.Context) { return } results.UserName = user.Name + if !user.KeepEmailPrivate { + results.UserEmail = user.Email + } } // Don't allow pushing if the repo is archived -- cgit v1.2.3