summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-23 16:27:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-23 16:27:44 +0000
commit2da7c8579601c14a93d4291b8cf5fa39c6eeabd8 (patch)
treea219fcd8376529ecfd6a944450374e67c3fbf52d
parenta3b5d8f1fb05f4b01bd955a7b8cbaa2af1175606 (diff)
downloadgitlab-ce-2da7c8579601c14a93d4291b8cf5fa39c6eeabd8.tar.gz
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.1
-rw-r--r--CHANGELOG.md11
-rw-r--r--GITALY_SERVER_VERSION2
2 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98cecdc0558..07b76d3183f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 14.2.1 (2021-08-23)
+
+### Fixed (1 change)
+
+- [Drop un-used db/ci_migrate symlink](gitlab-org/gitlab@1154311625345e120407c0c397c7d4a27848a739) ([merge request](gitlab-org/gitlab!68723))
+
+### Changed (2 changes)
+
+- [Reorder vuln check criteria](gitlab-org/gitlab@9bbb20db46362a859632e7bb88deba985318ca2c) ([merge request](gitlab-org/gitlab!68723)) **GitLab Enterprise Edition**
+- [Don't override vulnerability feedback UUID anymore](gitlab-org/gitlab@5f8372fb782c9416ae5ab582009a4399cb7d3750) ([merge request](gitlab-org/gitlab!68723)) **GitLab Enterprise Edition**
+
## 14.2.0 (2021-08-20)
### Added (128 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 9714cb35be2..83ecc0b2ef1 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-14.2.0 \ No newline at end of file
+14.2.1 \ No newline at end of file