diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 14:51:05 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 14:51:05 +0000 |
| commit | b0811992eb6cf2c51a0d13cbfb0d71abc13329a6 (patch) | |
| tree | 157791818aa6de1125093c4218e5c10bc364b783 | |
| parent | afeda35e8cd6f961dbd6bbc622c500fadfccb83d (diff) | |
| download | gitlab-ce-b0811992eb6cf2c51a0d13cbfb0d71abc13329a6.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@12-5-stable-ee
| -rw-r--r-- | CHANGELOG-EE.md | 4 | ||||
| -rw-r--r-- | GITLAB_WORKHORSE_VERSION | 2 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/a-signing-workhorse.yml | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | vendor/gitignore/Java.gitignore | 0 |
6 files changed, 11 insertions, 2 deletions
diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md index 6cd7ded91cd..4abb5a989ca 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.8 + +- No changes. + ## 12.5.7 - No changes. diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION index 6092827e644..12800750c1b 100644 --- a/GITLAB_WORKHORSE_VERSION +++ b/GITLAB_WORKHORSE_VERSION @@ -1 +1 @@ -8.14.1 +8.14.2 @@ -1 +1 @@ -12.5.8 +12.5.8-ee diff --git a/changelogs/unreleased/a-signing-workhorse.yml b/changelogs/unreleased/a-signing-workhorse.yml new file mode 100644 index 00000000000..05133d656b5 --- /dev/null +++ b/changelogs/unreleased/a-signing-workhorse.yml @@ -0,0 +1,5 @@ +--- +title: Update workhorse to v8.14.2 +merge_request: +author: +type: security 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 |