summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-04-05 16:11:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-04-05 16:11:51 +0000
commitae06966da16860568740fd607fdf98377fcada81 (patch)
treec18b42a6a79a1b2b1165b1b262c61bc9015336df
parent5fb29bb0c1f424e6215c909c6b3dbbce2ab52f85 (diff)
downloadgitlab-ce-ae06966da16860568740fd607fdf98377fcada81.tar.gz
Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.2
-rw-r--r--CHANGELOG.md12
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--GITLAB_PAGES_VERSION2
3 files changed, 14 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a057d880cbd..ed84f10dab0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 15.10.2 (2023-04-05)
+
+### Fixed (3 changes)
+
+- [Fix openapi viewer for relative url instances](gitlab-org/gitlab@28c94e7f0e0c29651383212e16422e0b384cddb9) ([merge request](gitlab-org/gitlab!115480))
+- [Update mail gem to v2.8.1](gitlab-org/gitlab@1ec987737d7a3ee96bb1ef8efa3f06fcd32c31e4) ([merge request](gitlab-org/gitlab!116173))
+- [Move ldap option sync_name to ldap server and fix bugs](gitlab-org/gitlab@e56f6d11f76ae858f602b23ea1e2875eb8754fe5) by @zhzhang93 ([merge request](gitlab-org/gitlab!115820)) **GitLab Enterprise Edition**
+
+### Changed (1 change)
+
+- [Migrate the existing RedisHLL keys to default slot](gitlab-org/gitlab@5fa90b0ef485aee29f62c500fb48c19278099ef0) ([merge request](gitlab-org/gitlab!116604))
+
## 15.10.1 (2023-03-30)
### Fixed (2 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 5d856da4528..3f6377f7a89 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-15.10.1 \ No newline at end of file
+15.10.2 \ No newline at end of file
diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION
index 5d856da4528..3f6377f7a89 100644
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
@@ -1 +1 @@
-15.10.1 \ No newline at end of file
+15.10.2 \ No newline at end of file