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 | bcedbbdff1524c63dfacd79b6799e15c30601099 (patch) | |
| tree | 85778ee6a9170196751103275d6cb08cf5db53d2 | |
| parent | 17509f82b95a4a8f85be4d0090e2032d544ce2e3 (diff) | |
Add latest changes from gitlab-org/security/gitlab@13-5-stable-ee
| -rw-r--r-- | GITLAB_WORKHORSE_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/security-workhorse-prometheus-13-5.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 f66efe38785..3c049ca13df 100644 --- a/GITLAB_WORKHORSE_VERSION +++ b/GITLAB_WORKHORSE_VERSION @@ -1 +1 @@ -8.51.0 +8.51.2 diff --git a/changelogs/unreleased/security-workhorse-prometheus-13-5.yml b/changelogs/unreleased/security-workhorse-prometheus-13-5.yml new file mode 100644 index 00000000000..13b22e808c2 --- /dev/null +++ b/changelogs/unreleased/security-workhorse-prometheus-13-5.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade Workhorse to 8.51.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 |