aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Madel <kmadel@mac.com>2016-12-22 01:01:15 -0500
committer无闻 <u@gogs.io>2016-12-22 01:01:15 -0500
commit3b0e2c1c3fd1b20d5afc3344aefb8af1b1dcb5b4 (patch)
tree68d21a76b463e017cf8363f0c453837936854fea
parent79a2745b4af3420d154a28d64c5db65ec2ec363b (diff)
PR Webhook - Add base/head info (#3547)
* messing with getting local go-gogs-client * coding style fix * added comments for required fields
-rw-r--r--models/pull.go30
1 files changed, 18 insertions, 12 deletions
diff --git a/models/pull.go b/models/pull.go
index fd3923ce..4bfc8ddf 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -113,22 +113,28 @@ func (pr *PullRequest) LoadIssue() (err error) {
// This method assumes following fields have been assigned with valid values:
// Required - Issue
+// Required - HeadRepo
+// Required - BaseRepo
// Optional - Merger
func (pr *PullRequest) APIFormat() *api.PullRequest {
apiIssue := pr.Issue.APIFormat()
apiPullRequest := &api.PullRequest{
- ID: pr.ID,
- Index: pr.Index,
- Poster: apiIssue.Poster,
- Title: apiIssue.Title,
- Body: apiIssue.Body,
- Labels: apiIssue.Labels,
- Milestone: apiIssue.Milestone,
- Assignee: apiIssue.Assignee,
- State: apiIssue.State,
- Comments: apiIssue.Comments,
- HTMLURL: pr.Issue.HTMLURL(),
- HasMerged: pr.HasMerged,
+ ID: pr.ID,
+ Index: pr.Index,
+ Poster: apiIssue.Poster,
+ Title: apiIssue.Title,
+ Body: apiIssue.Body,
+ Labels: apiIssue.Labels,
+ Milestone: apiIssue.Milestone,
+ Assignee: apiIssue.Assignee,
+ State: apiIssue.State,
+ Comments: apiIssue.Comments,
+ HeadBranch: pr.HeadBranch,
+ HeadRepo: pr.HeadRepo.APIFormat(nil),
+ BaseBranch: pr.BaseBranch,
+ BaseRepo: pr.BaseRepo.APIFormat(nil),
+ HTMLURL: pr.Issue.HTMLURL(),
+ HasMerged: pr.HasMerged,
}
if pr.Status != PULL_REQUEST_STATUS_CHECKING {