summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-24 10:51:34 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-24 10:51:34 +0000
commit76b84b42f64b8009cc181d5da0c656a8a521986d (patch)
tree857f0d98570af7a8089cb93bf304f35f0e39faaa
parent37367ee2d2426cba21df34a70c21593e03b9dae4 (diff)
downloadgitlab-ce-14.0.1.tar.gz
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.1
-rw-r--r--CHANGELOG.md8
-rw-r--r--GITALY_SERVER_VERSION2
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c633b968ef..cf54b07c991 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 14.0.1 (2021-06-24)
+
+### Fixed (3 changes)
+
+- [Remove add button from Devops Adoption](gitlab-org/gitlab@1c60bdf5daf64f10f001eeb5134f08a53a148d90) ([merge request](gitlab-org/gitlab!64764)) **GitLab Enterprise Edition**
+- [DevOps Adoption - ensure displayNamespaceId is included](gitlab-org/gitlab@9eb7cd5212cfc19f4cd6578c8e4afc7b4da27eab) ([merge request](gitlab-org/gitlab!64764)) **GitLab Enterprise Edition**
+- [Add Helm-2to3.gitlab-ci.yml to Auto DevOps](gitlab-org/gitlab@61ac7f46b06fcf151be62407dc0837a44843800e) ([merge request](gitlab-org/gitlab!64764))
+
## 14.0.0 (2021-06-21)
### Added (116 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index f13c819ca94..8d2e58b40f0 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-14.0.0 \ No newline at end of file
+14.0.1 \ No newline at end of file