Merge remote-tracking branch 'origin'

remote/gitea/fixtures/hooks.go

@@ -39,11 +39,13 @@ const HookPush = `
   "pusher": {
     "name": "gordon",
     "email": "gordon@golang.org",
-    "username": "gordon"
+    "username": "gordon",
+    "login": "gordon"
   },
   "sender": {
     "login": "gordon",
     "id": 1,
+    "username": "gordon",
     "avatar_url": "http://gitea.golang.org///1.gravatar.com/avatar/8c58a0be77ee441bb8f8595b7f1b4e87"
   }
 }

remote/gitea/helper.go

@@ -88,6 +88,7 @@ func buildFromPush(hook *pushHook) *model.Build {
 		Message:   hook.Commits[0].Message,
 		Avatar:    avatar,
 		Author:    author,
+		Email:     hook.Pusher.Email,
 		Timestamp: time.Now().UTC().Unix(),
 		Sender:    sender,
 	}

remote/gitea/helper_test.go

@@ -33,7 +33,9 @@ func Test_parse(t *testing.T) {
 			g.Assert(hook.Pusher.Name).Equal("gordon")
 			g.Assert(hook.Pusher.Email).Equal("gordon@golang.org")
 			g.Assert(hook.Pusher.Username).Equal("gordon")
+			g.Assert(hook.Pusher.Login).Equal("gordon")
 			g.Assert(hook.Sender.Login).Equal("gordon")
+			g.Assert(hook.Sender.Username).Equal("gordon")
 			g.Assert(hook.Sender.Avatar).Equal("http://gitea.golang.org///1.gravatar.com/avatar/8c58a0be77ee441bb8f8595b7f1b4e87")
 		})
 

remote/gogs/helper.go

@@ -88,6 +88,7 @@ func buildFromPush(hook *pushHook) *model.Build {
 		Message:   hook.Commits[0].Message,
 		Avatar:    avatar,
 		Author:    author,
+		Email:     hook.Pusher.Email,
 		Timestamp: time.Now().UTC().Unix(),
 		Sender:    sender,
 	}