From 8ffd441a87767a0fc9a6a4f19a7481609d537d02 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 21 Apr 2023 14:06:49 +0000
Subject: Add latest changes from gitlab-org/gitlab@15-10-stable-ee

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe66c5df665..2fd9c06984b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 15.10.4 (2023-04-21)
+
+### Fixed (1 change)
+
+- [Patch mail gem to handle TLS settings properly](gitlab-org/gitlab@cd4cfc46e17c91dbf5ef10ab1ca0a473d6b2a4d6) ([merge request](gitlab-org/gitlab!117559))
+
 ## 15.10.3 (2023-04-14)
 
 ### Fixed (3 changes)
-- 
cgit v1.2.3