diff options
| author | Sandro Santilli <strk@kbt.io> | 2016-11-22 11:43:30 +0100 |
|---|---|---|
| committer | Sandro Santilli <strk@kbt.io> | 2016-11-24 09:03:29 +0100 |
| commit | dd9d0f3732bf35c45fae2799c243b87099445ef5 (patch) | |
| tree | f138208678459f2c95c7a9be43aef403abd20d65 /models/pull.go | |
| parent | 6ed7f269f198b5a57e5bc7eca6ddec4980417899 (diff) | |
| download | gitea-dd9d0f3732bf35c45fae2799c243b87099445ef5.tar.gz gitea-dd9d0f3732bf35c45fae2799c243b87099445ef5.zip | |
Lint action.go
Diffstat (limited to 'models/pull.go')
| -rw-r--r-- | models/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go index 4b7034ce4d..d1ff974371 100644 --- a/models/pull.go +++ b/models/pull.go @@ -318,7 +318,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error Before: pr.MergeBase, After: pr.MergedCommitID, CompareURL: setting.AppUrl + pr.BaseRepo.ComposeCompareURL(pr.MergeBase, pr.MergedCommitID), - Commits: ListToPushCommits(l).ToApiPayloadCommits(pr.BaseRepo.HTMLURL()), + Commits: ListToPushCommits(l).ToAPIPayloadCommits(pr.BaseRepo.HTMLURL()), Repo: pr.BaseRepo.APIFormat(nil), Pusher: pr.HeadRepo.MustOwner().APIFormat(), Sender: doer.APIFormat(), |