diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-02 19:26:27 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-02 19:26:27 +0000 |
| commit | d59830c663b6cad85a71b698f4a0f3afc102c135 (patch) | |
| tree | d14689f94f054ecfb706ba33a4a99f2299d68af2 | |
| parent | c1bf3f6a82328c5c323b57d0eaf0c25cc4ff4866 (diff) | |
| download | gitlab-ce-d59830c663b6cad85a71b698f4a0f3afc102c135.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@12-6-stable-ee
| -rw-r--r-- | CHANGELOG-EE.md | 8 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/Java.gitignore | 0 |
4 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md index dc4e390ebc8..b52bdaef27d 100644 --- a/CHANGELOG-EE.md +++ b/CHANGELOG-EE.md @@ -1,5 +1,13 @@ Please view this file on the master branch, on stable branches it's out of date. +## 12.6.2 + +### Security (2 changes) + +- Don't publish drafts if user can't create notes. +- Remove protected tag access when group is removed. + + ## 12.6.1 - No changes. @@ -1 +1 @@ -12.6.2 +12.6.2-ee 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 |