From 8ffd441a87767a0fc9a6a4f19a7481609d537d02 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 21 Apr 2023 14:06:49 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-10-stable-ee --- CHANGELOG.md | 6 ++++++ GITALY_SERVER_VERSION | 2 +- GITLAB_PAGES_VERSION | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) 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) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 48370e692e5..597ea7a6e31 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -15.10.3 \ No newline at end of file +15.10.4 \ No newline at end of file diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index 48370e692e5..597ea7a6e31 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -15.10.3 \ No newline at end of file +15.10.4 \ No newline at end of file -- cgit v1.2.1