diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-17 14:07:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-17 14:07:35 +0300 |
| commit | 4469fca16f1680fe40a4e1ada8b75550af469c44 (patch) | |
| tree | 35003adcbc4c8a941dbff73bbae2e4b0fccc8044 | |
| parent | 59ff62d9d873f6deaef0f956c60adef7e13972df (diff) | |
Add latest changes from gitlab-org/security/gitlab@13-8-stable-eev13.8.6
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/security-patch-kramdown.yml | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/Java.gitignore | 0 |
5 files changed, 8 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 866522303f7..b91975e492a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.8.6 (2021-03-17) + +### Security (1 change) + +- Patch Kramdown syntax highlighter gem. + + ## 13.8.5 (2021-03-04) ### Security (6 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 16b3c156a4e..fb2ae584957 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.8.5
\ No newline at end of file +13.8.6
\ No newline at end of file diff --git a/changelogs/unreleased/security-patch-kramdown.yml b/changelogs/unreleased/security-patch-kramdown.yml deleted file mode 100644 index 792619327fe..00000000000 --- a/changelogs/unreleased/security-patch-kramdown.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Patch Kramdown syntax highlighter gem -merge_request: -author: -type: security diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore index 259148fa18f..259148fa18f 100755..100644 --- 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 100755..100644 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore |