diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 18:24:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 18:24:34 +0000 |
| commit | 453396ed5b1e1a0f4eca6b3d575405229bf417fd (patch) | |
| tree | 56f5720377546eb0cd5f8a973f6a2ff10e5bf41f | |
| parent | 50f4484eb9b67b582572cfffae697d277122d168 (diff) | |
| download | gitlab-ce-453396ed5b1e1a0f4eca6b3d575405229bf417fd.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-5-stable-ee
| -rw-r--r-- | CHANGELOG-EE.md | 7 | ||||
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | vendor/gitignore/Java.gitignore | 0 |
5 files changed, 12 insertions, 2 deletions
diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md index 3ee8fccc731..454eb38f937 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.5.4 + +### Security (1 change) + +- Fix stale Elasticsearch permissions when moving group from public group to private parent group. + + ## 12.5.3 ### Performance (1 change) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc4868481b4..2ac03f4eb08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,10 @@ entry. ## 12.5.4 -- No changes. +### Security (1 change) + +- Update maven_file_name_regex for full string match. + ## 12.5.3 @@ -1 +1 @@ -12.5.4 +12.5.4-ee diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore index 259148fa18f..259148fa18f 100644..100755 --- 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 100644..100755 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore |