diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-13 16:42:15 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-13 16:42:15 +0000 |
commit | 586bb7dc9629714cb1a46e358213063a6a48761b (patch) | |
tree | 07fd06d7077e2d57658f9f06bc8162510ec267df | |
parent | 7df48bd98b95ef5bfe78c1d110e3a9d7477efaa8 (diff) | |
download | gitlab-ce-586bb7dc9629714cb1a46e358213063a6a48761b.tar.gz |
Add latest changes from gitlab-org/gitlab@12-5-stable-ee
-rw-r--r-- | CHANGELOG-EE.md | 4 | ||||
-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 |
4 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md index 9d319e46069..6cd7ded91cd 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.5.7 + +- No changes. + ## 12.5.6 ### Security (2 changes) @@ -1 +1 @@ -12.5.7 +12.5.7-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 |