sim1222-mirror/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-08-10 18:53:58 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

[refactor] Unify the export of user data via API (#15144)

Browse Source 
* [refactor] unify how user data is exported via API

* test time via unix timestamp
This commit is contained in:
6543
2021-03-27 17:45:26 +01:00
committed by GitHub
parent f4d27498bd
commit 290cf75f93
26 changed files with 117 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/convert/pull.go
View File

@ -159,7 +159,7 @@ func ToAPIPullRequest(pr *models.PullRequest) *api.PullRequest {
if pr.HasMerged {
apiPullRequest.Merged = pr.MergedUnix.AsTimePtr()
apiPullRequest.MergedCommitID = &pr.MergedCommitID
apiPullRequest.MergedBy = ToUser(pr.Merger, false, false)
apiPullRequest.MergedBy = ToUser(pr.Merger, nil)
}
return apiPullRequest