From 4852ebf1066335b5c82d3af0a4d1b444f2e8e9cf Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Thu, 30 Dec 2021 07:44:42 +0100 Subject: [PATCH 1/3] Fix wrong redirect on org labels (#18128) --- routers/web/org/org_labels.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/org/org_labels.go b/routers/web/org/org_labels.go index 26e232bcc9a2f..c58a250b7ab6e 100644 --- a/routers/web/org/org_labels.go +++ b/routers/web/org/org_labels.go @@ -94,7 +94,7 @@ func DeleteLabel(ctx *context.Context) { func InitializeLabels(ctx *context.Context) { form := web.GetForm(ctx).(*forms.InitializeLabelsForm) if ctx.HasError() { - ctx.Redirect(ctx.Repo.RepoLink + "/labels") + ctx.Redirect(ctx.Org.OrgLink + "/labels") return } From 0c56d42d2b8792a9e2ea2bedeaf7777700664a77 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 30 Dec 2021 19:30:08 +0800 Subject: [PATCH 2/3] Also update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63fbe9ac1d1ff..660c2f82fd7d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io). * Add NotFound handler (#18062) (#18067) * Ensure that git repository is closed before transfer (#18049) (#18057) * Use common sessioner for API and web routes (#18114) + * Fix wrong redirect on org labels (#18134) * TRANSLATION * Fix code search result hint on zh-CN (#18053) From f163612ba338f94330b512d0c6deceb71bc4abde Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 30 Dec 2021 16:45:20 +0100 Subject: [PATCH 3/3] nit --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 622a2d78568d6..e4d13414574db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io). ## [1.15.9](https://github.com/go-gitea/gitea/releases/tag/v1.15.9) - 2021-12-30 * BUGFIXES + * Fix wrong redirect on org labels (#18128) (#18134) * Fix: unstable sort skips/duplicates issues across pages (#18094) (#18095) * Revert "Fix delete u2f keys bug (#18042)" (#18107) * Migrating wiki don't require token, so we should move it out of the require form (#17645) (#18104) @@ -18,7 +19,6 @@ been added to each release, please refer to the [blog](https://blog.gitea.io). * Add NotFound handler (#18062) (#18067) * Ensure that git repository is closed before transfer (#18049) (#18057) * Use common sessioner for API and web routes (#18114) - * Fix wrong redirect on org labels (#18134) * TRANSLATION * Fix code search result hint on zh-CN (#18053)