diff options
author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2023-05-10 20:13:52 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2023-05-10 20:13:52 +0000 |
commit | 10b88c653b1e880e2b6b5123f17edc34bf208083 (patch) | |
tree | 3bb1c4b4ce1c9fbe6415d23fc94fbda328192de0 | |
parent | 5c62758e66b6cb9df3f6415dc8da5d65c4d3b5fd (diff) | |
parent | 472365a5cdb28f4e89ca07cbd79051c51870fe31 (diff) | |
download | gitlab-ce-15-10-stable.tar.gz |
Merge remote-tracking branch 'dev/15-10-stable' into 15-10-stable15-10-stable
-rw-r--r-- | CHANGELOG.md | 6 | ||||
-rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
-rw-r--r-- | GITLAB_PAGES_VERSION | 2 | ||||
-rw-r--r-- | VERSION | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2119385f3a8..9244a75c3b7 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.7 (2023-05-10) + +### Fixed (1 change) + +- [Backport MR 119319 changes to 15-10-stable-ee](gitlab-org/security/gitlab@6c9e1f2f706b0151b1caa3d5199aa312b23c683a) **GitLab Enterprise Edition** + ## 15.10.6 (2023-05-03) ### Security (1 change) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 18a19cc6d8a..13aef295bb8 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -15.10.6
\ No newline at end of file +15.10.7
\ No newline at end of file diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index 18a19cc6d8a..13aef295bb8 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -15.10.6
\ No newline at end of file +15.10.7
\ No newline at end of file @@ -1 +1 @@ -15.10.6
\ No newline at end of file +15.10.7
\ No newline at end of file |