From 993ba7cc7fb45d5b58c26ac95dc8e881477d10f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Tue, 13 Aug 2024 17:28:50 +0200 Subject: [PATCH] Omit MR link from release notes When manually handling the release notes (due to rst markup, fixups etc.), the different MR number for backports causes needless friction. Remove the reference from release notes and keep it only in changelog which isn't manually redacted. --- contrib/gitchangelog/relnotes.rc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/gitchangelog/relnotes.rc.py b/contrib/gitchangelog/relnotes.rc.py index 8430c7f70c..b2dae3a710 100644 --- a/contrib/gitchangelog/relnotes.rc.py +++ b/contrib/gitchangelog/relnotes.rc.py @@ -46,7 +46,7 @@ body_process = ( r" :gl:`\3`", ) | ReSub(r"\n*Merge branch '[^']+' into [^\n]+", r"") - | ReSub(r"\n*See merge request isc-projects/bind9(!\d+)", r" :gl:`\1`") + | ReSub(r"\n*See merge request isc-projects/bind9(!\d+)", r"") | Wrap(regexp="\n\n", separator="\n\n") | strip )