2018-11-12 17:33:43 +00:00
|
|
|
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
|
|
|
|
index 77dc62d4f..27af125f8 100644
|
|
|
|
--- a/modules/setting/setting.go
|
|
|
|
+++ b/modules/setting/setting.go
|
|
|
|
@@ -347,9 +347,9 @@ var (
|
|
|
|
Description string
|
|
|
|
Keywords string
|
|
|
|
}{
|
|
|
|
- Author: "Gitea - Git with a cup of tea",
|
|
|
|
- Description: "Gitea (Git with a cup of tea) is a painless self-hosted Git service written in Go",
|
|
|
|
- Keywords: "go,git,self-hosted,gitea",
|
|
|
|
+ Author: "Gitdab",
|
|
|
|
+ Description: "Gitdab is a dabful git site made by people, for people",
|
|
|
|
+ Keywords: "go,git,dab,self-hosted,gitea,gitdab",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2018-11-12 12:04:01 +00:00
|
|
|
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
|
2018-11-12 17:33:43 +00:00
|
|
|
index fe54aa2a3..6af5a1e13 100644
|
2018-11-12 12:04:01 +00:00
|
|
|
--- a/routers/api/v1/api.go
|
|
|
|
+++ b/routers/api/v1/api.go
|
2018-11-12 17:33:43 +00:00
|
|
|
@@ -431,7 +431,7 @@ func RegisterRoutes(m *macaron.Macaron) {
|
2018-11-12 12:04:01 +00:00
|
|
|
m.Combo("/repositories/:id", reqToken()).Get(repo.GetByID)
|
|
|
|
|
|
|
|
m.Group("/repos", func() {
|
|
|
|
- m.Post("/migrate", reqToken(), bind(auth.MigrateRepoForm{}), repo.Migrate)
|
2018-11-12 17:33:43 +00:00
|
|
|
+ // m.Post("/migrate", reqToken(), bind(auth.MigrateRepoForm{}), repo.Migrate)
|
|
|
|
|
2018-11-12 12:04:01 +00:00
|
|
|
m.Group("/:username/:reponame", func() {
|
|
|
|
m.Combo("").Get(repo.Get).Delete(reqToken(), repo.Delete)
|
|
|
|
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
|
2018-11-12 17:33:43 +00:00
|
|
|
index e48b100af..016aecc5c 100644
|
2018-11-12 12:04:01 +00:00
|
|
|
--- a/routers/api/v1/repo/repo.go
|
|
|
|
+++ b/routers/api/v1/repo/repo.go
|
2018-11-12 17:33:43 +00:00
|
|
|
@@ -10,7 +10,7 @@ import (
|
2018-11-12 12:04:01 +00:00
|
|
|
"strings"
|
|
|
|
|
|
|
|
"code.gitea.io/gitea/models"
|
|
|
|
- "code.gitea.io/gitea/modules/auth"
|
2018-11-12 17:33:43 +00:00
|
|
|
+ // "code.gitea.io/gitea/modules/auth"
|
2018-11-12 12:04:01 +00:00
|
|
|
"code.gitea.io/gitea/modules/context"
|
|
|
|
"code.gitea.io/gitea/modules/log"
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
2018-11-12 17:33:43 +00:00
|
|
|
@@ -319,6 +319,7 @@ func CreateOrgRepo(ctx *context.APIContext, opt api.CreateRepoOption) {
|
2018-11-12 12:04:01 +00:00
|
|
|
}
|
|
|
|
|
2018-11-12 17:33:43 +00:00
|
|
|
// Migrate migrate remote git repository to gitea
|
|
|
|
+/*
|
|
|
|
func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) {
|
|
|
|
// swagger:operation POST /repos/migrate repository repoMigrate
|
|
|
|
// ---
|
|
|
|
@@ -416,6 +417,7 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) {
|
|
|
|
log.Trace("Repository migrated: %s/%s", ctxUser.Name, form.RepoName)
|
|
|
|
ctx.JSON(201, repo.APIFormat(models.AccessModeAdmin))
|
|
|
|
}
|
|
|
|
+*/
|
|
|
|
|
2018-11-12 12:04:01 +00:00
|
|
|
// Get one repository
|
|
|
|
func Get(ctx *context.APIContext) {
|
|
|
|
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
|
2018-11-12 17:33:43 +00:00
|
|
|
index 236d66bd1..d5ab721f9 100644
|
2018-11-12 12:04:01 +00:00
|
|
|
--- a/routers/repo/repo.go
|
|
|
|
+++ b/routers/repo/repo.go
|
2018-11-12 17:33:43 +00:00
|
|
|
@@ -20,12 +20,12 @@ import (
|
2018-11-12 12:04:01 +00:00
|
|
|
"code.gitea.io/gitea/modules/context"
|
|
|
|
"code.gitea.io/gitea/modules/log"
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
|
|
|
- "code.gitea.io/gitea/modules/util"
|
2018-11-12 17:33:43 +00:00
|
|
|
+ // "code.gitea.io/gitea/modules/util"
|
2018-11-12 12:04:01 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
const (
|
|
|
|
tplCreate base.TplName = "repo/create"
|
|
|
|
- tplMigrate base.TplName = "repo/migrate"
|
2018-11-12 17:33:43 +00:00
|
|
|
+ // tplMigrate base.TplName = "repo/migrate"
|
2018-11-12 12:04:01 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
// MustBeNotBare render when a repo is a bare git dir
|
2018-11-12 17:33:43 +00:00
|
|
|
@@ -189,7 +189,7 @@ func CreatePost(ctx *context.Context, form auth.CreateRepoForm) {
|
|
|
|
|
2018-11-12 12:04:01 +00:00
|
|
|
handleCreateError(ctx, ctxUser, err, "CreatePost", tplCreate, &form)
|
|
|
|
}
|
|
|
|
-
|
2018-11-12 17:33:43 +00:00
|
|
|
+/*
|
|
|
|
// Migrate render migration of repository page
|
|
|
|
func Migrate(ctx *context.Context) {
|
|
|
|
ctx.Data["Title"] = ctx.Tr("new_migrate")
|
|
|
|
@@ -278,7 +278,7 @@ func MigratePost(ctx *context.Context, form auth.MigrateRepoForm) {
|
|
|
|
|
|
|
|
handleCreateError(ctx, ctxUser, err, "MigratePost", tplMigrate, &form)
|
|
|
|
}
|
2018-11-12 12:04:01 +00:00
|
|
|
-
|
2018-11-12 17:33:43 +00:00
|
|
|
+*/
|
2018-11-12 12:04:01 +00:00
|
|
|
// Action response for actions to a repository
|
|
|
|
func Action(ctx *context.Context) {
|
|
|
|
var err error
|
|
|
|
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
|
2018-11-12 17:33:43 +00:00
|
|
|
index 4ca421065..38a322479 100644
|
2018-11-12 12:04:01 +00:00
|
|
|
--- a/routers/routes/routes.go
|
|
|
|
+++ b/routers/routes/routes.go
|
2018-11-12 17:33:43 +00:00
|
|
|
@@ -455,8 +455,8 @@ func RegisterRoutes(m *macaron.Macaron) {
|
2018-11-12 12:04:01 +00:00
|
|
|
m.Group("/repo", func() {
|
|
|
|
m.Get("/create", repo.Create)
|
|
|
|
m.Post("/create", bindIgnErr(auth.CreateRepoForm{}), repo.CreatePost)
|
|
|
|
- m.Get("/migrate", repo.Migrate)
|
|
|
|
- m.Post("/migrate", bindIgnErr(auth.MigrateRepoForm{}), repo.MigratePost)
|
2018-11-12 17:33:43 +00:00
|
|
|
+ // m.Get("/migrate", repo.Migrate)
|
|
|
|
+ // m.Post("/migrate", bindIgnErr(auth.MigrateRepoForm{}), repo.MigratePost)
|
2018-11-12 12:04:01 +00:00
|
|
|
m.Group("/fork", func() {
|
|
|
|
m.Combo("/:repoid").Get(repo.Fork).
|
|
|
|
Post(bindIgnErr(auth.CreateRepoForm{}), repo.ForkPost)
|