diff options
Diffstat (limited to 'internal/route/api/v1/repo')
-rw-r--r-- | internal/route/api/v1/repo/commits.go | 6 | ||||
-rw-r--r-- | internal/route/api/v1/repo/issue.go | 4 | ||||
-rw-r--r-- | internal/route/api/v1/repo/key.go | 4 | ||||
-rw-r--r-- | internal/route/api/v1/repo/repo.go | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/internal/route/api/v1/repo/commits.go b/internal/route/api/v1/repo/commits.go index 55bfc045..ddcd09b7 100644 --- a/internal/route/api/v1/repo/commits.go +++ b/internal/route/api/v1/repo/commits.go @@ -12,10 +12,10 @@ import ( "github.com/gogs/git-module" api "github.com/gogs/go-gogs-client" + "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" "gogs.io/gogs/internal/db" "gogs.io/gogs/internal/db/errors" - "gogs.io/gogs/internal/setting" ) func GetSingleCommit(c *context.APIContext) { @@ -70,12 +70,12 @@ func GetSingleCommit(c *context.APIContext) { c.JSONSuccess(&api.Commit{ CommitMeta: &api.CommitMeta{ - URL: setting.AppURL + c.Link[1:], + URL: conf.Server.ExternalURL + c.Link[1:], SHA: commit.ID.String(), }, HTMLURL: c.Repo.Repository.HTMLURL() + "/commits/" + commit.ID.String(), RepoCommit: &api.RepoCommit{ - URL: setting.AppURL + c.Link[1:], + URL: conf.Server.ExternalURL + c.Link[1:], Author: &api.CommitUser{ Name: commit.Author.Name, Email: commit.Author.Email, diff --git a/internal/route/api/v1/repo/issue.go b/internal/route/api/v1/repo/issue.go index 5d32a00c..39977f91 100644 --- a/internal/route/api/v1/repo/issue.go +++ b/internal/route/api/v1/repo/issue.go @@ -14,7 +14,7 @@ import ( "gogs.io/gogs/internal/context" "gogs.io/gogs/internal/db" "gogs.io/gogs/internal/db/errors" - "gogs.io/gogs/internal/setting" + "gogs.io/gogs/internal/conf" ) func listIssues(c *context.APIContext, opts *db.IssuesOptions) { @@ -40,7 +40,7 @@ func listIssues(c *context.APIContext, opts *db.IssuesOptions) { apiIssues[i] = issues[i].APIFormat() } - c.SetLinkHeader(int(count), setting.UI.IssuePagingNum) + c.SetLinkHeader(int(count), conf.UI.IssuePagingNum) c.JSONSuccess(&apiIssues) } diff --git a/internal/route/api/v1/repo/key.go b/internal/route/api/v1/repo/key.go index d47d4b46..d8012933 100644 --- a/internal/route/api/v1/repo/key.go +++ b/internal/route/api/v1/repo/key.go @@ -10,13 +10,13 @@ import ( api "github.com/gogs/go-gogs-client" + "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" "gogs.io/gogs/internal/db" - "gogs.io/gogs/internal/setting" ) func composeDeployKeysAPILink(repoPath string) string { - return setting.AppURL + "api/v1/repos/" + repoPath + "/keys/" + return conf.Server.ExternalURL + "api/v1/repos/" + repoPath + "/keys/" } // https://github.com/gogs/go-gogs-client/wiki/Repositories-Deploy-Keys#list-deploy-keys diff --git a/internal/route/api/v1/repo/repo.go b/internal/route/api/v1/repo/repo.go index 6950ce9b..a8838ae7 100644 --- a/internal/route/api/v1/repo/repo.go +++ b/internal/route/api/v1/repo/repo.go @@ -18,7 +18,7 @@ import ( "gogs.io/gogs/internal/db/errors" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/route/api/v1/convert" - "gogs.io/gogs/internal/setting" + "gogs.io/gogs/internal/conf" ) func Search(c *context.APIContext) { @@ -263,7 +263,7 @@ func Migrate(c *context.APIContext, f form.MigrateRepo) { repo, err := db.MigrateRepository(c.User, ctxUser, db.MigrateRepoOptions{ Name: f.RepoName, Description: f.Description, - IsPrivate: f.Private || setting.Repository.ForcePrivate, + IsPrivate: f.Private || conf.Repository.ForcePrivate, IsMirror: f.Mirror, RemoteAddr: remoteAddr, }) |