Skip to content

Commit daab245

Browse files
lunnylunny
authored
Move code.gitea.io/gitea/routers/api/v1/convert to code.gitea.io/gitea/modules/convert (#8892)
* Move code.gitea.io/gitea/routers/api/v1/convert to code.gitea.io/gitea/modules/convert * fix fmt
1 parent 1b7402b commit daab245

26 files changed

+24
-24
lines changed

‎integrations/api_team_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"testing"
1212

1313
"code.gitea.io/gitea/models"
14+
"code.gitea.io/gitea/modules/convert"
1415
api "code.gitea.io/gitea/modules/structs"
15-
"code.gitea.io/gitea/routers/api/v1/convert"
1616

1717
"github.com/stretchr/testify/assert"
1818
)

‎integrations/api_team_user_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"time"
1111

1212
"code.gitea.io/gitea/models"
13+
"code.gitea.io/gitea/modules/convert"
1314
api "code.gitea.io/gitea/modules/structs"
14-
"code.gitea.io/gitea/routers/api/v1/convert"
1515
"github.com/stretchr/testify/assert"
1616
)
1717

‎routers/api/v1/convert/convert.go renamed to ‎modules/convert/convert.go

File renamed without changes.

‎routers/api/v1/convert/utils.go renamed to ‎modules/convert/utils.go

File renamed without changes.

‎routers/api/v1/admin/org.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ package admin
88
import (
99
"code.gitea.io/gitea/models"
1010
"code.gitea.io/gitea/modules/context"
11+
"code.gitea.io/gitea/modules/convert"
1112
api "code.gitea.io/gitea/modules/structs"
12-
"code.gitea.io/gitea/routers/api/v1/convert"
1313
"code.gitea.io/gitea/routers/api/v1/user"
1414
)
1515

‎routers/api/v1/admin/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010

1111
"code.gitea.io/gitea/models"
1212
"code.gitea.io/gitea/modules/context"
13+
"code.gitea.io/gitea/modules/convert"
1314
"code.gitea.io/gitea/modules/log"
1415
"code.gitea.io/gitea/modules/password"
1516
api "code.gitea.io/gitea/modules/structs"
16-
"code.gitea.io/gitea/routers/api/v1/convert"
1717
"code.gitea.io/gitea/routers/api/v1/user"
1818
"code.gitea.io/gitea/services/mailer"
1919
)

‎routers/api/v1/org/hook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package org
77
import (
88
"code.gitea.io/gitea/models"
99
"code.gitea.io/gitea/modules/context"
10+
"code.gitea.io/gitea/modules/convert"
1011
api "code.gitea.io/gitea/modules/structs"
11-
"code.gitea.io/gitea/routers/api/v1/convert"
1212
"code.gitea.io/gitea/routers/api/v1/utils"
1313
)
1414

‎routers/api/v1/org/member.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
"code.gitea.io/gitea/models"
1111
"code.gitea.io/gitea/modules/context"
12+
"code.gitea.io/gitea/modules/convert"
1213
"code.gitea.io/gitea/modules/setting"
1314
api "code.gitea.io/gitea/modules/structs"
14-
"code.gitea.io/gitea/routers/api/v1/convert"
1515
"code.gitea.io/gitea/routers/api/v1/user"
1616
)
1717

‎routers/api/v1/org/org.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ package org
88
import (
99
"code.gitea.io/gitea/models"
1010
"code.gitea.io/gitea/modules/context"
11+
"code.gitea.io/gitea/modules/convert"
1112
api "code.gitea.io/gitea/modules/structs"
12-
"code.gitea.io/gitea/routers/api/v1/convert"
1313
"code.gitea.io/gitea/routers/api/v1/user"
1414
)
1515

‎routers/api/v1/org/team.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010

1111
"code.gitea.io/gitea/models"
1212
"code.gitea.io/gitea/modules/context"
13+
"code.gitea.io/gitea/modules/convert"
1314
"code.gitea.io/gitea/modules/log"
1415
api "code.gitea.io/gitea/modules/structs"
15-
"code.gitea.io/gitea/routers/api/v1/convert"
1616
"code.gitea.io/gitea/routers/api/v1/user"
1717
)
1818

‎routers/api/v1/repo/branch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ package repo
77

88
import (
99
"code.gitea.io/gitea/modules/context"
10+
"code.gitea.io/gitea/modules/convert"
1011
"code.gitea.io/gitea/modules/git"
1112
api "code.gitea.io/gitea/modules/structs"
12-
"code.gitea.io/gitea/routers/api/v1/convert"
1313
)
1414

1515
// GetBranch get a branch of a repository

‎routers/api/v1/repo/collaborators.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"code.gitea.io/gitea/models"
1212
"code.gitea.io/gitea/modules/context"
13+
"code.gitea.io/gitea/modules/convert"
1314
api "code.gitea.io/gitea/modules/structs"
14-
"code.gitea.io/gitea/routers/api/v1/convert"
1515
)
1616

1717
// ListCollaborators list a repository's collaborators

‎routers/api/v1/repo/git_hook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ package repo
66

77
import (
88
"code.gitea.io/gitea/modules/context"
9+
"code.gitea.io/gitea/modules/convert"
910
"code.gitea.io/gitea/modules/git"
1011
api "code.gitea.io/gitea/modules/structs"
11-
"code.gitea.io/gitea/routers/api/v1/convert"
1212
)
1313

1414
// ListGitHooks list all Git hooks of a repository

‎routers/api/v1/repo/hook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ package repo
77
import (
88
"code.gitea.io/gitea/models"
99
"code.gitea.io/gitea/modules/context"
10+
"code.gitea.io/gitea/modules/convert"
1011
"code.gitea.io/gitea/modules/git"
1112
api "code.gitea.io/gitea/modules/structs"
1213
"code.gitea.io/gitea/modules/webhook"
13-
"code.gitea.io/gitea/routers/api/v1/convert"
1414
"code.gitea.io/gitea/routers/api/v1/utils"
1515
)
1616

‎routers/api/v1/repo/key.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
"code.gitea.io/gitea/models"
1111
"code.gitea.io/gitea/modules/context"
12+
"code.gitea.io/gitea/modules/convert"
1213
"code.gitea.io/gitea/modules/setting"
1314
api "code.gitea.io/gitea/modules/structs"
14-
"code.gitea.io/gitea/routers/api/v1/convert"
1515
)
1616

1717
// appendPrivateInformation appends the owner and key type information to api.PublicKey

‎routers/api/v1/repo/repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"code.gitea.io/gitea/models"
1717
"code.gitea.io/gitea/modules/auth"
1818
"code.gitea.io/gitea/modules/context"
19+
"code.gitea.io/gitea/modules/convert"
1920
"code.gitea.io/gitea/modules/log"
2021
"code.gitea.io/gitea/modules/migrations"
2122
"code.gitea.io/gitea/modules/notification"
@@ -24,7 +25,6 @@ import (
2425
api "code.gitea.io/gitea/modules/structs"
2526
"code.gitea.io/gitea/modules/util"
2627
"code.gitea.io/gitea/modules/validation"
27-
"code.gitea.io/gitea/routers/api/v1/convert"
2828
mirror_service "code.gitea.io/gitea/services/mirror"
2929
repo_service "code.gitea.io/gitea/services/repository"
3030
)

‎routers/api/v1/repo/star.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ package repo
66

77
import (
88
"code.gitea.io/gitea/modules/context"
9+
"code.gitea.io/gitea/modules/convert"
910
api "code.gitea.io/gitea/modules/structs"
10-
"code.gitea.io/gitea/routers/api/v1/convert"
1111
)
1212

1313
// ListStargazers list a repository's stargazers

‎routers/api/v1/repo/subscriber.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ package repo
66

77
import (
88
"code.gitea.io/gitea/modules/context"
9+
"code.gitea.io/gitea/modules/convert"
910
api "code.gitea.io/gitea/modules/structs"
10-
"code.gitea.io/gitea/routers/api/v1/convert"
1111
)
1212

1313
// ListSubscribers list a repo's subscribers (i.e. watchers)

‎routers/api/v1/repo/tag.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"net/http"
99

1010
"code.gitea.io/gitea/modules/context"
11+
"code.gitea.io/gitea/modules/convert"
1112
api "code.gitea.io/gitea/modules/structs"
12-
"code.gitea.io/gitea/routers/api/v1/convert"
1313
)
1414

1515
// ListTags list all the tags of a repository

‎routers/api/v1/repo/topic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010

1111
"code.gitea.io/gitea/models"
1212
"code.gitea.io/gitea/modules/context"
13+
"code.gitea.io/gitea/modules/convert"
1314
"code.gitea.io/gitea/modules/log"
1415
api "code.gitea.io/gitea/modules/structs"
15-
"code.gitea.io/gitea/routers/api/v1/convert"
1616
)
1717

1818
// ListTopics returns list of current topics for repo

‎routers/api/v1/user/email.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ package user
77
import (
88
"code.gitea.io/gitea/models"
99
"code.gitea.io/gitea/modules/context"
10+
"code.gitea.io/gitea/modules/convert"
1011
"code.gitea.io/gitea/modules/setting"
1112
api "code.gitea.io/gitea/modules/structs"
12-
"code.gitea.io/gitea/routers/api/v1/convert"
1313
)
1414

1515
// ListEmails list all of the authenticated user's email addresses

‎routers/api/v1/user/follower.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package user
77
import (
88
"code.gitea.io/gitea/models"
99
"code.gitea.io/gitea/modules/context"
10+
"code.gitea.io/gitea/modules/convert"
1011
api "code.gitea.io/gitea/modules/structs"
11-
"code.gitea.io/gitea/routers/api/v1/convert"
1212
)
1313

1414
func responseAPIUsers(ctx *context.APIContext, users []*models.User) {

‎routers/api/v1/user/gpg_key.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package user
77
import (
88
"code.gitea.io/gitea/models"
99
"code.gitea.io/gitea/modules/context"
10+
"code.gitea.io/gitea/modules/convert"
1011
api "code.gitea.io/gitea/modules/structs"
11-
"code.gitea.io/gitea/routers/api/v1/convert"
1212
)
1313

1414
func listGPGKeys(ctx *context.APIContext, uid int64) {

‎routers/api/v1/user/key.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ package user
77
import (
88
"code.gitea.io/gitea/models"
99
"code.gitea.io/gitea/modules/context"
10+
"code.gitea.io/gitea/modules/convert"
1011
"code.gitea.io/gitea/modules/setting"
1112
api "code.gitea.io/gitea/modules/structs"
12-
"code.gitea.io/gitea/routers/api/v1/convert"
1313
"code.gitea.io/gitea/routers/api/v1/repo"
1414
)
1515

‎routers/api/v1/user/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"code.gitea.io/gitea/models"
1212
"code.gitea.io/gitea/modules/context"
13+
"code.gitea.io/gitea/modules/convert"
1314
api "code.gitea.io/gitea/modules/structs"
14-
"code.gitea.io/gitea/routers/api/v1/convert"
1515

1616
"github.com/unknwon/com"
1717
)

‎routers/api/v1/utils/hook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111

1212
"code.gitea.io/gitea/models"
1313
"code.gitea.io/gitea/modules/context"
14+
"code.gitea.io/gitea/modules/convert"
1415
api "code.gitea.io/gitea/modules/structs"
1516
"code.gitea.io/gitea/modules/webhook"
16-
"code.gitea.io/gitea/routers/api/v1/convert"
1717
"code.gitea.io/gitea/routers/utils"
1818

1919
"github.com/unknwon/com"

0 commit comments

Comments
 (0)