Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Fix breakage from vendor-update

Browse source
This commit is contained in:
Kim "BKC" Carlbäcker 2016-11-29 09:25:47 +01:00
parent dad806d3ea
commit 42ec5ce740
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
models/issue.go
View file

@ -173,9 +173,9 @@ func (issue *Issue) HTMLURL() string {
// State returns string representation of issue status. // State returns string representation of issue status.
func (issue *Issue) State() api.StateType { func (issue *Issue) State() api.StateType {
if issue.IsClosed { if issue.IsClosed {
return api.STATE_CLOSED return api.StateClosed
} }
return api.STATE_OPEN return api.StateOpen
} }
// APIFormat assumes some fields assigned with values: // APIFormat assumes some fields assigned with values:
@ -483,7 +483,7 @@ func (issue *Issue) ChangeStatus(doer *User, repo *Repository, isClosed bool) (e
if isClosed { if isClosed {
apiPullRequest.Action = api.HookIssueClosed apiPullRequest.Action = api.HookIssueClosed
} else { } else {
apiPullRequest.Action = api.HookIssueReopened apiPullRequest.Action = api.HookIssueReOpened
} }
err = PrepareWebhooks(repo, HookEventPullRequest, apiPullRequest) err = PrepareWebhooks(repo, HookEventPullRequest, apiPullRequest)
} }
@ -1409,9 +1409,9 @@ func (m *Milestone) AfterSet(colName string, _ xorm.Cell) {
// State returns string representation of milestone status. // State returns string representation of milestone status.
func (m *Milestone) State() api.StateType { func (m *Milestone) State() api.StateType {
if m.IsClosed { if m.IsClosed {
return api.STATE_CLOSED return api.StateClosed
} }
return api.STATE_OPEN return api.StateOpen
} }
// APIFormat returns this Milestone in API format. // APIFormat returns this Milestone in API format.

2
models/pull.go
View file

@ -139,7 +139,7 @@ func (pr *PullRequest) APIFormat() *api.PullRequest {
if pr.Status != PullRequestStatusChecking { if pr.Status != PullRequestStatusChecking {
mergeable := pr.Status != PullRequestStatusConflict mergeable := pr.Status != PullRequestStatusConflict
apiPullRequest.Mergeable = &mergeable apiPullRequest.Mergeable = mergeable
} }
if pr.HasMerged { if pr.HasMerged {
apiPullRequest.Merged = &pr.Merged apiPullRequest.Merged = &pr.Merged

2
models/user.go
View file

@ -174,7 +174,7 @@ func (u *User) APIFormat() *api.User {
UserName: u.Name, UserName: u.Name,
FullName: u.FullName, FullName: u.FullName,
Email: u.Email, Email: u.Email,
AvatarUrl: u.AvatarLink(), AvatarURL: u.AvatarLink(),
} }
} }

2
models/webhook_slack.go
View file

@ -157,7 +157,7 @@ func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*S
} else { } else {
text = fmt.Sprintf("[%s] Pull request closed: %s by %s", p.Repository.FullName, titleLink, senderLink) 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) text = fmt.Sprintf("[%s] Pull request re-opened: %s by %s", p.Repository.FullName, titleLink, senderLink)
case api.HookIssueEdited: case api.HookIssueEdited:
text = fmt.Sprintf("[%s] Pull request edited: %s by %s", p.Repository.FullName, titleLink, senderLink) text = fmt.Sprintf("[%s] Pull request edited: %s by %s", p.Repository.FullName, titleLink, senderLink)

2
routers/api/v1/convert/convert.go
View file

@ -115,7 +115,7 @@ func ToDeployKey(apiLink string, key *models.DeployKey) *api.DeployKey {
func ToOrganization(org *models.User) *api.Organization { func ToOrganization(org *models.User) *api.Organization {
return &api.Organization{ return &api.Organization{
ID: org.ID, ID: org.ID,
AvatarUrl: org.AvatarLink(), AvatarURL: org.AvatarLink(),
UserName: org.Name, UserName: org.Name,
FullName: org.FullName, FullName: org.FullName,
Description: org.Description, Description: org.Description,

2
routers/api/v1/repo/issue.go
View file

@ -165,7 +165,7 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) {
return return
} }
if form.State != nil { if form.State != nil {
if err = issue.ChangeStatus(ctx.User, ctx.Repo.Repository, api.STATE_CLOSED == api.StateType(*form.State)); err != nil { if err = issue.ChangeStatus(ctx.User, ctx.Repo.Repository, api.StateClosed == api.StateType(*form.State)); err != nil {
ctx.Error(500, "ChangeStatus", err) ctx.Error(500, "ChangeStatus", err)
return return
} }

2
routers/api/v1/user/user.go
View file

@ -38,7 +38,7 @@ func Search(ctx *context.APIContext) {
results[i] = &api.User{ results[i] = &api.User{
ID: users[i].ID, ID: users[i].ID,
UserName: users[i].Name, UserName: users[i].Name,
AvatarUrl: users[i].AvatarLink(), AvatarURL: users[i].AvatarLink(),
FullName: users[i].FullName, FullName: users[i].FullName,
} }
if ctx.IsSigned { if ctx.IsSigned {