Skip to content

Commit 65b7dfc

Browse files
committed
Fix lint
1 parent 061a12a commit 65b7dfc

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

routers/api/v1/repo/issue.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"time"
1414

1515
"code.gitea.io/gitea/models/db"
16-
issue_model "code.gitea.io/gitea/models/issues"
1716
issues_model "code.gitea.io/gitea/models/issues"
1817
"code.gitea.io/gitea/models/organization"
1918
access_model "code.gitea.io/gitea/models/perm/access"
@@ -897,7 +896,7 @@ func EditIssue(ctx *context.APIContext) {
897896
oldMilestoneID := issue.MilestoneID
898897
issue.MilestoneID = *form.Milestone
899898
if issue.MilestoneID > 0 {
900-
issue.Milestone, err = issue_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, *form.Milestone)
899+
issue.Milestone, err = issues_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, *form.Milestone)
901900
if err != nil {
902901
ctx.APIErrorInternal(err)
903902
return

routers/api/v1/repo/pull.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414

1515
activities_model "code.gitea.io/gitea/models/activities"
1616
git_model "code.gitea.io/gitea/models/git"
17-
issue_model "code.gitea.io/gitea/models/issues"
1817
issues_model "code.gitea.io/gitea/models/issues"
1918
access_model "code.gitea.io/gitea/models/perm/access"
2019
pull_model "code.gitea.io/gitea/models/pull"
@@ -707,7 +706,7 @@ func EditPullRequest(ctx *context.APIContext) {
707706
issue.MilestoneID != form.Milestone {
708707
oldMilestoneID := issue.MilestoneID
709708
issue.MilestoneID = form.Milestone
710-
issue.Milestone, err = issue_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, form.Milestone)
709+
issue.Milestone, err = issues_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, form.Milestone)
711710
if err != nil {
712711
ctx.APIErrorInternal(err)
713712
return

routers/web/repo/issue.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"strings"
1414

1515
"code.gitea.io/gitea/models/db"
16-
issue_model "code.gitea.io/gitea/models/issues"
1716
issues_model "code.gitea.io/gitea/models/issues"
1817
"code.gitea.io/gitea/models/organization"
1918
access_model "code.gitea.io/gitea/models/perm/access"
@@ -421,7 +420,7 @@ func UpdateIssueMilestone(ctx *context.Context) {
421420
issue.MilestoneID = milestoneID
422421
if milestoneID > 0 {
423422
var err error
424-
issue.Milestone, err = issue_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, milestoneID)
423+
issue.Milestone, err = issues_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, milestoneID)
425424
if err != nil {
426425
ctx.ServerError("GetMileStoneByID", err)
427426
return

tests/integration/issue_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ func testIssueAddComment(t *testing.T, session *TestSession, issueURL, content,
187187
func testIssueChangeMilestone(t *testing.T, session *TestSession, repoLink string, issueID, milestoneID int64) {
188188
req := NewRequestWithValues(t, "POST", fmt.Sprintf(repoLink+"/issues/milestone?issue_ids=%d", issueID), map[string]string{
189189
"_csrf": GetUserCSRFToken(t, session),
190-
"id": fmt.Sprintf("%d", milestoneID),
190+
"id": strconv.FormatInt(milestoneID, 64),
191191
})
192192
resp := session.MakeRequest(t, req, http.StatusOK)
193193
assert.Equal(t, `{"ok":true}`, strings.TrimSpace(resp.Body.String()))

0 commit comments

Comments
 (0)