Browse Source

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
tags/v1.11.0-rc1
Lunny Xiao GitHub 6 years ago
parent
commit
ed968cb57c
26 changed files with 24 additions and 24 deletions
  1. +1
    -1
      integrations/api_team_test.go
  2. +1
    -1
      integrations/api_team_user_test.go
  3. +0
    -0
      modules/convert/convert.go
  4. +0
    -0
      modules/convert/utils.go
  5. +1
    -1
      routers/api/v1/admin/org.go
  6. +1
    -1
      routers/api/v1/admin/user.go
  7. +1
    -1
      routers/api/v1/org/hook.go
  8. +1
    -1
      routers/api/v1/org/member.go
  9. +1
    -1
      routers/api/v1/org/org.go
  10. +1
    -1
      routers/api/v1/org/team.go
  11. +1
    -1
      routers/api/v1/repo/branch.go
  12. +1
    -1
      routers/api/v1/repo/collaborators.go
  13. +1
    -1
      routers/api/v1/repo/git_hook.go
  14. +1
    -1
      routers/api/v1/repo/hook.go
  15. +1
    -1
      routers/api/v1/repo/key.go
  16. +1
    -1
      routers/api/v1/repo/repo.go
  17. +1
    -1
      routers/api/v1/repo/star.go
  18. +1
    -1
      routers/api/v1/repo/subscriber.go
  19. +1
    -1
      routers/api/v1/repo/tag.go
  20. +1
    -1
      routers/api/v1/repo/topic.go
  21. +1
    -1
      routers/api/v1/user/email.go
  22. +1
    -1
      routers/api/v1/user/follower.go
  23. +1
    -1
      routers/api/v1/user/gpg_key.go
  24. +1
    -1
      routers/api/v1/user/key.go
  25. +1
    -1
      routers/api/v1/user/user.go
  26. +1
    -1
      routers/api/v1/utils/hook.go

+ 1
- 1
integrations/api_team_test.go View File

@@ -11,8 +11,8 @@ import (
"testing"

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/convert"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"

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


+ 1
- 1
integrations/api_team_user_test.go View File

@@ -10,8 +10,8 @@ import (
"time"

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/convert"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
"github.com/stretchr/testify/assert"
)



routers/api/v1/convert/convert.go → modules/convert/convert.go View File


routers/api/v1/convert/utils.go → modules/convert/utils.go View File


+ 1
- 1
routers/api/v1/admin/org.go View File

@@ -8,8 +8,8 @@ package admin
import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
"code.gitea.io/gitea/routers/api/v1/user"
)



+ 1
- 1
routers/api/v1/admin/user.go View File

@@ -10,10 +10,10 @@ import (

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/password"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
"code.gitea.io/gitea/routers/api/v1/user"
"code.gitea.io/gitea/services/mailer"
)


+ 1
- 1
routers/api/v1/org/hook.go View File

@@ -7,8 +7,8 @@ package org
import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
"code.gitea.io/gitea/routers/api/v1/utils"
)



+ 1
- 1
routers/api/v1/org/member.go View File

@@ -9,9 +9,9 @@ import (

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
"code.gitea.io/gitea/routers/api/v1/user"
)



+ 1
- 1
routers/api/v1/org/org.go View File

@@ -8,8 +8,8 @@ package org
import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
"code.gitea.io/gitea/routers/api/v1/user"
)



+ 1
- 1
routers/api/v1/org/team.go View File

@@ -10,9 +10,9 @@ import (

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
"code.gitea.io/gitea/modules/log"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
"code.gitea.io/gitea/routers/api/v1/user"
)



+ 1
- 1
routers/api/v1/repo/branch.go View File

@@ -7,9 +7,9 @@ package repo

import (
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
"code.gitea.io/gitea/modules/git"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
)

// GetBranch get a branch of a repository


+ 1
- 1
routers/api/v1/repo/collaborators.go View File

@@ -10,8 +10,8 @@ import (

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
)

// ListCollaborators list a repository's collaborators


+ 1
- 1
routers/api/v1/repo/git_hook.go View File

@@ -6,9 +6,9 @@ package repo

import (
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
"code.gitea.io/gitea/modules/git"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
)

// ListGitHooks list all Git hooks of a repository


+ 1
- 1
routers/api/v1/repo/hook.go View File

@@ -7,10 +7,10 @@ package repo
import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
"code.gitea.io/gitea/modules/git"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/webhook"
"code.gitea.io/gitea/routers/api/v1/convert"
"code.gitea.io/gitea/routers/api/v1/utils"
)



+ 1
- 1
routers/api/v1/repo/key.go View File

@@ -9,9 +9,9 @@ import (

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
)

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


+ 1
- 1
routers/api/v1/repo/repo.go View File

@@ -16,6 +16,7 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/auth"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/migrations"
"code.gitea.io/gitea/modules/notification"
@@ -24,7 +25,6 @@ import (
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/validation"
"code.gitea.io/gitea/routers/api/v1/convert"
mirror_service "code.gitea.io/gitea/services/mirror"
repo_service "code.gitea.io/gitea/services/repository"
)


+ 1
- 1
routers/api/v1/repo/star.go View File

@@ -6,8 +6,8 @@ package repo

import (
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
)

// ListStargazers list a repository's stargazers


+ 1
- 1
routers/api/v1/repo/subscriber.go View File

@@ -6,8 +6,8 @@ package repo

import (
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
)

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


+ 1
- 1
routers/api/v1/repo/tag.go View File

@@ -8,8 +8,8 @@ import (
"net/http"

"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
)

// ListTags list all the tags of a repository


+ 1
- 1
routers/api/v1/repo/topic.go View File

@@ -10,9 +10,9 @@ import (

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
"code.gitea.io/gitea/modules/log"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
)

// ListTopics returns list of current topics for repo


+ 1
- 1
routers/api/v1/user/email.go View File

@@ -7,9 +7,9 @@ package user
import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
)

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


+ 1
- 1
routers/api/v1/user/follower.go View File

@@ -7,8 +7,8 @@ package user
import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
)

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


+ 1
- 1
routers/api/v1/user/gpg_key.go View File

@@ -7,8 +7,8 @@ package user
import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
)

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


+ 1
- 1
routers/api/v1/user/key.go View File

@@ -7,9 +7,9 @@ package user
import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
"code.gitea.io/gitea/routers/api/v1/repo"
)



+ 1
- 1
routers/api/v1/user/user.go View File

@@ -10,8 +10,8 @@ import (

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"

"github.com/unknwon/com"
)


+ 1
- 1
routers/api/v1/utils/hook.go View File

@@ -11,9 +11,9 @@ import (

"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/webhook"
"code.gitea.io/gitea/routers/api/v1/convert"
"code.gitea.io/gitea/routers/utils"

"github.com/unknwon/com"


Loading…
Cancel
Save