summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-04-21 14:06:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-04-21 14:06:49 +0000
commit8ffd441a87767a0fc9a6a4f19a7481609d537d02 (patch)
tree27df1eec3bc5e8a44cda33e1c4cabb37b54aa581
parent156b920d33098e5af21fbca542a7b152d468f7f7 (diff)
downloadgitlab-ce-8ffd441a87767a0fc9a6a4f19a7481609d537d02.tar.gz
Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.4
-rw-r--r--CHANGELOG.md6
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--GITLAB_PAGES_VERSION2
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