summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-30 14:29:40 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-30 14:29:40 +0000
commit7ee5843e68796c69ef438b1cf127690132384d8e (patch)
tree1775c273f599ce7c39ce7f46ea98a06f293801c5
parentb0dac638975888582da878cdae1946ac5ef4487d (diff)
downloadgitlab-ce-7ee5843e68796c69ef438b1cf127690132384d8e.tar.gz
Add latest changes from gitlab-org/security/gitlab@12-6-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 70b2e699918..eb742864b24 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.6.5
+
+- No changes.
+
## 12.6.4
- No changes.
diff --git a/VERSION b/VERSION
index bccdc17d817..d977c0a5999 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.6.5
+12.6.5-ee