From 02eade2a1fe5477001b933926bb897e2c324040b Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Fri, 11 Oct 2019 16:33:14 +0300 Subject: [PATCH] Update link and remove code patches --- README.md | 12 +-- customizations/custom/templates/home.tmpl | 2 +- customizations/giteadiff.diff | 111 ---------------------- 3 files changed, 7 insertions(+), 118 deletions(-) delete mode 100644 customizations/giteadiff.diff diff --git a/README.md b/README.md index 7cbbeb0..9894fce 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# gitdab +![Transparent background gitdab logo](icons/gitdab_transparent.png) -Gitdab's scripts, icons and gitea customizations +# Gitdab -We run a fork of Gitea v1.8.0-rc3 with following code changes: -- Repo migrations are disabled to prevent leaking server's IP address. -- The description on embeds is changed. +Gitdab's scripts, icons and gitea customizations. -Various other changes are also applied to templates. +We run gitea with various template changes. + +Historically we had some code changes, currently we don't have any of them, but we might get some more eventually. Those will be shared here as well. ## License diff --git a/customizations/custom/templates/home.tmpl b/customizations/custom/templates/home.tmpl index cd8e3f3..f4ef1cb 100644 --- a/customizations/custom/templates/home.tmpl +++ b/customizations/custom/templates/home.tmpl @@ -47,7 +47,7 @@ Open Source

- Gitdab uses Gitea, which is open source. Also, all of our customizations, scripts and icons are open source too. + Gitdab uses Gitea, which is open source. Also, all of our customizations, scripts and icons are open source too.

diff --git a/customizations/giteadiff.diff b/customizations/giteadiff.diff deleted file mode 100644 index fed27a6..0000000 --- a/customizations/giteadiff.diff +++ /dev/null @@ -1,111 +0,0 @@ -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", - }, - } - -diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go -index fe54aa2a3..6af5a1e13 100644 ---- a/routers/api/v1/api.go -+++ b/routers/api/v1/api.go -@@ -431,7 +431,7 @@ func RegisterRoutes(m *macaron.Macaron) { - m.Combo("/repositories/:id", reqToken()).Get(repo.GetByID) - - m.Group("/repos", func() { -- m.Post("/migrate", reqToken(), bind(auth.MigrateRepoForm{}), repo.Migrate) -+ // m.Post("/migrate", reqToken(), bind(auth.MigrateRepoForm{}), repo.Migrate) - - 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 -index e48b100af..016aecc5c 100644 ---- a/routers/api/v1/repo/repo.go -+++ b/routers/api/v1/repo/repo.go -@@ -10,7 +10,7 @@ import ( - "strings" - - "code.gitea.io/gitea/models" -- "code.gitea.io/gitea/modules/auth" -+ // "code.gitea.io/gitea/modules/auth" - "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" -@@ -319,6 +319,7 @@ func CreateOrgRepo(ctx *context.APIContext, opt api.CreateRepoOption) { - } - - // 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)) - } -+*/ - - // Get one repository - func Get(ctx *context.APIContext) { -diff --git a/routers/repo/repo.go b/routers/repo/repo.go -index 236d66bd1..d5ab721f9 100644 ---- a/routers/repo/repo.go -+++ b/routers/repo/repo.go -@@ -20,12 +20,12 @@ import ( - "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" -- "code.gitea.io/gitea/modules/util" -+ // "code.gitea.io/gitea/modules/util" - ) - - const ( - tplCreate base.TplName = "repo/create" -- tplMigrate base.TplName = "repo/migrate" -+ // tplMigrate base.TplName = "repo/migrate" - ) - - // MustBeNotBare render when a repo is a bare git dir -@@ -189,7 +189,7 @@ func CreatePost(ctx *context.Context, form auth.CreateRepoForm) { - - handleCreateError(ctx, ctxUser, err, "CreatePost", tplCreate, &form) - } -- -+/* - // 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) - } -- -+*/ - // 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 -index 4ca421065..38a322479 100644 ---- a/routers/routes/routes.go -+++ b/routers/routes/routes.go -@@ -455,8 +455,8 @@ func RegisterRoutes(m *macaron.Macaron) { - 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) -+ // m.Get("/migrate", repo.Migrate) -+ // m.Post("/migrate", bindIgnErr(auth.MigrateRepoForm{}), repo.MigratePost) - m.Group("/fork", func() { - m.Combo("/:repoid").Get(repo.Fork). - Post(bindIgnErr(auth.CreateRepoForm{}), repo.ForkPost)