From 8a301fb9159a4ca1baee1fb9fd9191daae82a6a5 Mon Sep 17 00:00:00 2001
From: Evan Culver <eculver@users.noreply.github.com>
Date: Thu, 17 Feb 2022 19:21:47 -0800
Subject: [PATCH] ci: combine 'enhancement' entry type with 'improvement'
 (#12376)

---
 .changelog/12376.txt      | 3 +++
 .changelog/changelog.tmpl | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .changelog/12376.txt

diff --git a/.changelog/12376.txt b/.changelog/12376.txt
new file mode 100644
index 0000000000..948ab71984
--- /dev/null
+++ b/.changelog/12376.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+ci: include 'enhancement' entry type in IMPROVEMENTS section of changelog.
+```
diff --git a/.changelog/changelog.tmpl b/.changelog/changelog.tmpl
index 3ed26b0245..c1de4293b9 100644
--- a/.changelog/changelog.tmpl
+++ b/.changelog/changelog.tmpl
@@ -22,10 +22,11 @@ FEATURES:
 {{ end -}}
 {{- end -}}
 
-{{- if .NotesByType.improvement }}
+{{- $improvements := combineTypes .NotesByType.improvement .NotesByType.enhancement -}}
+{{- if $improvements }}
 IMPROVEMENTS:
 
-{{range .NotesByType.improvement -}}
+{{range $improvements | sort -}}
 * {{ template "note" . }}
 {{ end -}}
 {{- end -}}