summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-26 17:54:35 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-26 17:54:35 +0000
commitcfd66800be3a1f416fe240f9d015af939331e347 (patch)
tree8ef18fa8d36527f0ab92f000091a0f3300e79c58
parentf52e92d5400ae9d2796de4d32d54f197f9fdc463 (diff)
downloadgitlab-ce-cfd66800be3a1f416fe240f9d015af939331e347.tar.gz
Add latest changes from gitlab-org/gitlab@12-8-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 a2f417a16c6..18f0da6bd28 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.8.8 (2020-03-26)
+
+### Security (1 change)
+
+- Add NPM package versions SemVer validation.
+
+
## 12.8.7 (2020-03-16)
### Fixed (1 change)
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