From 61a66332e9b8bd1415bd45f451ec27c70b4aa07b Mon Sep 17 00:00:00 2001 From: Richard Mahn Date: Fri, 14 Jan 2022 12:43:35 -0500 Subject: [PATCH 1/6] Update CHANGELOG.md --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4d13414574db..c3c8fbc405401 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,18 @@ This changelog goes through all the changes that have been made in each release without substantial changes to our git log; to see the highlights of what has been added to each release, please refer to the [blog](https://blog.gitea.io). +## [1.15.10](https://github.com/go-gitea/gitea/releases/tag/v1.15.10) - 2022-01-14 + +* BUGFIXES + * Fix inconsistent PR comment counts (#18260) (#18261) + * Fix release link broken (#18253) + * Fix update user bug (#18251) + * Set HeadCommit when creating tags. (#18116) (#18173) + * Use correct translation key for error messages due to max repo limits (#18135 & #18153) (#18152) +* MISC + * Fix purple color in suggested label colors (#18242) + * Bump mermaid from 8.10.1 to 8.13.8 (#18198) (#18206) + ## [1.15.9](https://github.com/go-gitea/gitea/releases/tag/v1.15.9) - 2021-12-30 * BUGFIXES From 5c682e1cd2beb9302225e0c68af1adb7c7375fae Mon Sep 17 00:00:00 2001 From: Richard Mahn Date: Fri, 14 Jan 2022 12:48:50 -0500 Subject: [PATCH 2/6] Adds original PRs --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3c8fbc405401..6c269187bb93f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,12 @@ been added to each release, please refer to the [blog](https://blog.gitea.io). * BUGFIXES * Fix inconsistent PR comment counts (#18260) (#18261) - * Fix release link broken (#18253) - * Fix update user bug (#18251) + * Fix release link broken (#18252) (#18253) + * Fix update user bug (18250) (#18251) * Set HeadCommit when creating tags. (#18116) (#18173) * Use correct translation key for error messages due to max repo limits (#18135 & #18153) (#18152) * MISC - * Fix purple color in suggested label colors (#18242) + * Fix purple color in suggested label colors (#18241) (#18242) * Bump mermaid from 8.10.1 to 8.13.8 (#18198) (#18206) ## [1.15.9](https://github.com/go-gitea/gitea/releases/tag/v1.15.9) - 2021-12-30 From 92b2d341e6c4d1e714af12ddca8343be4fce5695 Mon Sep 17 00:00:00 2001 From: Richard Mahn Date: Fri, 14 Jan 2022 12:50:05 -0500 Subject: [PATCH 3/6] Adds original PRs --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c269187bb93f..cc7036055c4a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io). * BUGFIXES * Fix inconsistent PR comment counts (#18260) (#18261) * Fix release link broken (#18252) (#18253) - * Fix update user bug (18250) (#18251) + * Fix update user bug (#18250) (#18251) * Set HeadCommit when creating tags. (#18116) (#18173) * Use correct translation key for error messages due to max repo limits (#18135 & #18153) (#18152) * MISC From 53d304d56fc8ac12af42e5d2c647ac13c421bce5 Mon Sep 17 00:00:00 2001 From: Richard Mahn Date: Fri, 14 Jan 2022 12:51:39 -0500 Subject: [PATCH 4/6] Better title for issue --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc7036055c4a8..96c74298a879f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io). * BUGFIXES * Fix inconsistent PR comment counts (#18260) (#18261) * Fix release link broken (#18252) (#18253) - * Fix update user bug (#18250) (#18251) + * Fix update user from site administration page bug (#18250) (#18251) * Set HeadCommit when creating tags. (#18116) (#18173) * Use correct translation key for error messages due to max repo limits (#18135 & #18153) (#18152) * MISC From bdd00957ff2e548cf28e44fc5ce0da082bda6b0d Mon Sep 17 00:00:00 2001 From: Richard Mahn Date: Fri, 14 Jan 2022 12:52:12 -0500 Subject: [PATCH 5/6] Better title for issue --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96c74298a879f..0b4d328417366 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io). * Fix inconsistent PR comment counts (#18260) (#18261) * Fix release link broken (#18252) (#18253) * Fix update user from site administration page bug (#18250) (#18251) - * Set HeadCommit when creating tags. (#18116) (#18173) + * Set HeadCommit when creating tags (#18116) (#18173) * Use correct translation key for error messages due to max repo limits (#18135 & #18153) (#18152) * MISC * Fix purple color in suggested label colors (#18241) (#18242) From de8dc9c9fe2aa6ed47faf8db3b700c4522afd792 Mon Sep 17 00:00:00 2001 From: zeripath Date: Fri, 14 Jan 2022 18:03:55 +0000 Subject: [PATCH 6/6] Apply suggestions from code review --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b4d328417366..7696e0d71068b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,8 +12,8 @@ been added to each release, please refer to the [blog](https://blog.gitea.io). * Fix update user from site administration page bug (#18250) (#18251) * Set HeadCommit when creating tags (#18116) (#18173) * Use correct translation key for error messages due to max repo limits (#18135 & #18153) (#18152) -* MISC * Fix purple color in suggested label colors (#18241) (#18242) +* SECURITY * Bump mermaid from 8.10.1 to 8.13.8 (#18198) (#18206) ## [1.15.9](https://github.com/go-gitea/gitea/releases/tag/v1.15.9) - 2021-12-30