diff options
| author | 6543 <6543@obermui.de> | 2020-10-17 06:23:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-17 00:23:08 -0400 |
| commit | d453533beb197d25b25530dc5f0e3c3c0742d8d1 (patch) | |
| tree | 6d66e1163333344d91af63e9ab50a82367470b8f /modules/convert/pull.go | |
| parent | 131278ff222f1a8580f20e6bbdff405341403042 (diff) | |
| download | gitea-d453533beb197d25b25530dc5f0e3c3c0742d8d1.tar.gz gitea-d453533beb197d25b25530dc5f0e3c3c0742d8d1.zip | |
[Refactor] Move APIFormat functions into convert package (#12856)
* USER APIFormat -> ToUser
* Migrate more and mark APIFormat deprecated
* models.Comment APIFormat() -> convert.ToComment
* models.Release APIFormat() -> convert.ToRelease
* models.Attachments APIFormat() -> convert.ToReleaseAttachments
* models.CommitStatus APIFormat() -> convert.ToCommitStatus
* finish migration to convert.ToUser
* Move Test
* Imprufe Test
* fix test
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'modules/convert/pull.go')
| -rw-r--r-- | modules/convert/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/convert/pull.go b/modules/convert/pull.go index 2fa22efcb3..e522bee787 100644 --- a/modules/convert/pull.go +++ b/modules/convert/pull.go @@ -141,7 +141,7 @@ func ToAPIPullRequest(pr *models.PullRequest) *api.PullRequest { if pr.HasMerged { apiPullRequest.Merged = pr.MergedUnix.AsTimePtr() apiPullRequest.MergedCommitID = &pr.MergedCommitID - apiPullRequest.MergedBy = pr.Merger.APIFormat() + apiPullRequest.MergedBy = ToUser(pr.Merger, false, false) } return apiPullRequest |