diff options
| author | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2016-11-29 09:25:47 +0100 |
|---|---|---|
| committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2016-11-29 11:50:22 +0100 |
| commit | 42ec5ce740fdd646755ca38ea5ce20f6cc7dc6b1 (patch) | |
| tree | 125a480f9643570c92dd2859ba3bfc6d2b39b31d /models | |
| parent | dad806d3ea0da6a09eea14ac467d0c843a98dda4 (diff) | |
| download | gitea-42ec5ce740fdd646755ca38ea5ce20f6cc7dc6b1.tar.gz gitea-42ec5ce740fdd646755ca38ea5ce20f6cc7dc6b1.zip | |
Fix breakage from vendor-update
Diffstat (limited to 'models')
| -rw-r--r-- | models/issue.go | 10 | ||||
| -rw-r--r-- | models/pull.go | 2 | ||||
| -rw-r--r-- | models/user.go | 2 | ||||
| -rw-r--r-- | models/webhook_slack.go | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/models/issue.go b/models/issue.go index d3418e4449..990d4a4bc5 100644 --- a/models/issue.go +++ b/models/issue.go @@ -173,9 +173,9 @@ func (issue *Issue) HTMLURL() string { // State returns string representation of issue status. func (issue *Issue) State() api.StateType { if issue.IsClosed { - return api.STATE_CLOSED + return api.StateClosed } - return api.STATE_OPEN + return api.StateOpen } // APIFormat assumes some fields assigned with values: @@ -483,7 +483,7 @@ func (issue *Issue) ChangeStatus(doer *User, repo *Repository, isClosed bool) (e if isClosed { apiPullRequest.Action = api.HookIssueClosed } else { - apiPullRequest.Action = api.HookIssueReopened + apiPullRequest.Action = api.HookIssueReOpened } err = PrepareWebhooks(repo, HookEventPullRequest, apiPullRequest) } @@ -1409,9 +1409,9 @@ func (m *Milestone) AfterSet(colName string, _ xorm.Cell) { // State returns string representation of milestone status. func (m *Milestone) State() api.StateType { if m.IsClosed { - return api.STATE_CLOSED + return api.StateClosed } - return api.STATE_OPEN + return api.StateOpen } // APIFormat returns this Milestone in API format. diff --git a/models/pull.go b/models/pull.go index f2eb895960..f1b92bff58 100644 --- a/models/pull.go +++ b/models/pull.go @@ -139,7 +139,7 @@ func (pr *PullRequest) APIFormat() *api.PullRequest { if pr.Status != PullRequestStatusChecking { mergeable := pr.Status != PullRequestStatusConflict - apiPullRequest.Mergeable = &mergeable + apiPullRequest.Mergeable = mergeable } if pr.HasMerged { apiPullRequest.Merged = &pr.Merged diff --git a/models/user.go b/models/user.go index 63544b365f..ad20abe24d 100644 --- a/models/user.go +++ b/models/user.go @@ -174,7 +174,7 @@ func (u *User) APIFormat() *api.User { UserName: u.Name, FullName: u.FullName, Email: u.Email, - AvatarUrl: u.AvatarLink(), + AvatarURL: u.AvatarLink(), } } diff --git a/models/webhook_slack.go b/models/webhook_slack.go index a872e7256c..aaeef6a001 100644 --- a/models/webhook_slack.go +++ b/models/webhook_slack.go @@ -157,7 +157,7 @@ func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*S } else { text = fmt.Sprintf("[%s] Pull request closed: %s by %s", p.Repository.FullName, titleLink, senderLink) } - case api.HookIssueReopened: + case api.HookIssueReOpened: text = fmt.Sprintf("[%s] Pull request re-opened: %s by %s", p.Repository.FullName, titleLink, senderLink) case api.HookIssueEdited: text = fmt.Sprintf("[%s] Pull request edited: %s by %s", p.Repository.FullName, titleLink, senderLink) |