summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-26 18:06:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-26 18:06:09 +0000
commit928c80821cbe530fd2f49f3ebd75bcd3c61750f7 (patch)
tree70a56146a092524b6d660939e3b0353077d6277b
parente8ca9e433a5ef0fb6fcb49c578a223670434ab0e (diff)
downloadgitlab-ce-928c80821cbe530fd2f49f3ebd75bcd3c61750f7.tar.gz
Add latest changes from gitlab-org/gitlab@12-7-stable-ee
-rw-r--r--CHANGELOG-EE.md7
-rw-r--r--[-rwxr-xr-x]vendor/gitignore/C++.gitignore0
-rw-r--r--[-rwxr-xr-x]vendor/gitignore/Java.gitignore0
3 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md
index 313c4675c1e..6cffd4b3787 100644
--- a/CHANGELOG-EE.md
+++ b/CHANGELOG-EE.md
@@ -1,5 +1,12 @@
Please view this file on the master branch, on stable branches it's out of date.
+## 12.7.8 (2020-03-26)
+
+### Security (1 change)
+
+- Add NPM package versions SemVer validation.
+
+
## 12.7.7
### Security (5 changes)
diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore
index 259148fa18f..259148fa18f 100755..100644
--- a/vendor/gitignore/C++.gitignore
+++ b/vendor/gitignore/C++.gitignore
diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore
index a1c2a238a96..a1c2a238a96 100755..100644
--- a/vendor/gitignore/Java.gitignore
+++ b/vendor/gitignore/Java.gitignore