diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-06 22:33:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-06 22:33:00 +0300 |
| commit | 46a52c7b0a9ced1f7a3d139343b72d2e787e38f2 (patch) | |
| tree | ceb9144c3066cdc4d25892f71fbe80d22626678f | |
| parent | e85719b439c7ec3f2f8e3d518776f6dc307bd000 (diff) | |
Add latest changes from gitlab-org/security/gitlab@13-6-stable-ee
| -rw-r--r-- | GITLAB_WORKHORSE_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/security-workhorse-prometheus-13-6.yml | 5 | ||||
| -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, 6 insertions, 1 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION index a99caf2cdef..275754a681a 100644 --- a/GITLAB_WORKHORSE_VERSION +++ b/GITLAB_WORKHORSE_VERSION @@ -1 +1 @@ -8.54.0 +8.54.2 diff --git a/changelogs/unreleased/security-workhorse-prometheus-13-6.yml b/changelogs/unreleased/security-workhorse-prometheus-13-6.yml new file mode 100644 index 00000000000..0f9165ff146 --- /dev/null +++ b/changelogs/unreleased/security-workhorse-prometheus-13-6.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade Workhorse to 8.54.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 |