From 490d2c67b7934c9b75409196784ed0536746e8c8 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Tue, 21 Feb 2023 09:54:36 -0600 Subject: [PATCH 1/5] chore: changelog 1.18.5 Signed-off-by: jolheiser --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77dc47e32fb5c..20c8c0073638a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,17 @@ 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.18.5](https://github.com/go-gitea/gitea/releases/tag/v1.18.5) - 2023-02-21 + +* BUGFIXES + * Add force_merge to merge request and fix checking mergable (#23010) (#23032) + * Use `--message=%s` for git commit message (#23028) (#23029) + * Render access log template as text instead of HTML (#23013) (#23025) + * Fix the Manually Merged form (#23015) (#23017) + * Use beforeCommit instead of baseCommit (#22949) (#22996) +* MISC + * Hide 2FA status from other members in organization members list (#22999) (#23023) + ## [1.18.4](https://github.com/go-gitea/gitea/releases/tag/1.18.4) - 2023-02-20 * SECURITY From a913f0315567f32eec0bab2c356095b544b2439c Mon Sep 17 00:00:00 2001 From: jolheiser Date: Tue, 21 Feb 2023 10:16:13 -0600 Subject: [PATCH 2/5] fix: enhancement Signed-off-by: jolheiser --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20c8c0073638a..cde6803d4efd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,14 +6,14 @@ been added to each release, please refer to the [blog](https://blog.gitea.io). ## [1.18.5](https://github.com/go-gitea/gitea/releases/tag/v1.18.5) - 2023-02-21 +* ENHANCEMENTS + * Hide 2FA status from other members in organization members list (#22999) (#23023) * BUGFIXES * Add force_merge to merge request and fix checking mergable (#23010) (#23032) * Use `--message=%s` for git commit message (#23028) (#23029) * Render access log template as text instead of HTML (#23013) (#23025) * Fix the Manually Merged form (#23015) (#23017) * Use beforeCommit instead of baseCommit (#22949) (#22996) -* MISC - * Hide 2FA status from other members in organization members list (#22999) (#23023) ## [1.18.4](https://github.com/go-gitea/gitea/releases/tag/1.18.4) - 2023-02-20 From e890dd7e3883f35dd7f368d276c26433b4c6fc86 Mon Sep 17 00:00:00 2001 From: John Olheiser Date: Tue, 21 Feb 2023 11:12:52 -0600 Subject: [PATCH 3/5] chore: missing PR --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cde6803d4efd3..9ca29fff6150b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io). * Render access log template as text instead of HTML (#23013) (#23025) * Fix the Manually Merged form (#23015) (#23017) * Use beforeCommit instead of baseCommit (#22949) (#22996) + * Display attachments of review comment when comment content is blank (#23035) (#23046) ## [1.18.4](https://github.com/go-gitea/gitea/releases/tag/1.18.4) - 2023-02-20 From 91d250879afc1a1ae0855d6944d2d51b58f870ab Mon Sep 17 00:00:00 2001 From: John Olheiser Date: Tue, 21 Feb 2023 11:16:40 -0600 Subject: [PATCH 4/5] chore: whitespace --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ca29fff6150b..96f611a11dbe6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io). * Render access log template as text instead of HTML (#23013) (#23025) * Fix the Manually Merged form (#23015) (#23017) * Use beforeCommit instead of baseCommit (#22949) (#22996) - * Display attachments of review comment when comment content is blank (#23035) (#23046) + * Display attachments of review comment when comment content is blank (#23035) (#23046) ## [1.18.4](https://github.com/go-gitea/gitea/releases/tag/1.18.4) - 2023-02-20 From 3a264e57db5422b5c9371ddd7bf01a32cc42793e Mon Sep 17 00:00:00 2001 From: John Olheiser Date: Tue, 21 Feb 2023 11:37:32 -0600 Subject: [PATCH 5/5] chore: missing PR --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96f611a11dbe6..358a0e37493b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io). * Fix the Manually Merged form (#23015) (#23017) * Use beforeCommit instead of baseCommit (#22949) (#22996) * Display attachments of review comment when comment content is blank (#23035) (#23046) + * Return empty url for submodule tree entries (#23043) (#23048) ## [1.18.4](https://github.com/go-gitea/gitea/releases/tag/1.18.4) - 2023-02-20