Merge pull request 'contributors' (#198) from contributors into V20210731.patch

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/198

routers/repo/view.go

@@ -590,20 +590,31 @@ func Home(ctx *context.Context) {
 		if err == nil && contributors != nil {
 			var contributorInfos []*ContributorInfo
 			for _, c := range contributors {
+				// get user info from committer email
 				user, err := models.GetUserByEmail(c.Email)
 				if err == nil {
+					// committer is system user, get info through user's primary email
 					existedContributorInfo := getContributorInfo(contributorInfos,user.Email)
 					if existedContributorInfo != nil {
+						// existed: same primary email, different committer name
 						existedContributorInfo.CommitCnt += c.CommitCnt
 					}else{
+						// new committer info
 						contributorInfos = append(contributorInfos, &ContributorInfo{
 							user, user.Email,c.CommitCnt,
 						})
 					}
 				} else {
-					contributorInfos = append(contributorInfos, &ContributorInfo{
-						nil, c.Email,c.CommitCnt,
-					})
+					// committer is not system user
+					existedContributorInfo := getContributorInfo(contributorInfos,c.Email)
+					if existedContributorInfo != nil {
+						// existed: same primary email, different committer name
+						existedContributorInfo.CommitCnt += c.CommitCnt
+					}else{
+						contributorInfos = append(contributorInfos, &ContributorInfo{
+							nil, c.Email,c.CommitCnt,
+						})
+					}
 				}
 			}
 			ctx.Data["ContributorInfo"] = contributorInfos