summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-27 20:44:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-27 20:44:50 +0000
commited8af41027110fdad8f7bb4d53329eb73417fb8d (patch)
treea3ca15851a4882fb8482b29ff3f61fa618f96ff5
parent5413c6cd4922f13ca384bb099c631622ac4e48f8 (diff)
downloadgitlab-ce-ed8af41027110fdad8f7bb4d53329eb73417fb8d.tar.gz
Add latest changes from gitlab-org/gitlab@12-5-stable-ee
-rw-r--r--CHANGELOG-EE.md4
-rw-r--r--VERSION2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md
index 4da28b73cdb..cc3f76b7960 100644
--- a/CHANGELOG-EE.md
+++ b/CHANGELOG-EE.md
@@ -1,5 +1,9 @@
Please view this file on the master branch, on stable branches it's out of date.
+## 12.5.2
+
+- No changes.
+
## 12.5.1
### Security (6 changes)
diff --git a/VERSION b/VERSION
index 96f72240e4c..23c2fe97586 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.5.2
+12.5.2-ee