summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-10-04 13:45:39 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-10-04 13:45:39 +0000
commitef309cf1466c3d2a9297d735c7127fcaf0c08d48 (patch)
tree8fd01b3b4d6ee36d294d87d35f0d6ba8e26dcbf9
parent9ab82cd533e3ef0ef7141d385539b9a7c1fda94b (diff)
downloadgitlab-ce-ef309cf1466c3d2a9297d735c7127fcaf0c08d48.tar.gz
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.2
-rw-r--r--CHANGELOG.md6
-rw-r--r--GITALY_SERVER_VERSION2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 981136a2ed2..d5faca300b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 15.4.2 (2022-10-04)
+
+### Fixed (1 change)
+
+- [Ensure that stage name and record are in sync for page deployments](gitlab-org/gitlab@ce58ec2ef959bd35ddbc6992560a163c8fc4f145) ([merge request](gitlab-org/gitlab!100037))
+
## 15.4.1 (2022-09-29)
### Security (15 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 65d9b5b1094..baec1bc73e6 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-15.4.1 \ No newline at end of file
+15.4.2 \ No newline at end of file