From 4cc568a54bf02be71113624cd9003350f582d623 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 17 Mar 2021 11:23:26 +0000 Subject: Add latest changes from gitlab-org/security/gitlab@13-7-stable-ee --- CHANGELOG.md | 7 +++++++ GITALY_SERVER_VERSION | 2 +- changelogs/unreleased/security-patch-kramdown.yml | 5 ----- vendor/gitignore/C++.gitignore | 0 vendor/gitignore/Java.gitignore | 0 5 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 changelogs/unreleased/security-patch-kramdown.yml mode change 100755 => 100644 vendor/gitignore/C++.gitignore mode change 100755 => 100644 vendor/gitignore/Java.gitignore diff --git a/CHANGELOG.md b/CHANGELOG.md index 5de844c88a6..29f238a162e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.7.9 (2021-03-17) + +### Security (1 change) + +- Patch Kramdown syntax highlighter gem. + + ## 13.7.8 (2021-03-04) ### Security (5 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 9255caa9bd7..470e34e1d71 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.7.8 \ No newline at end of file +13.7.9 \ 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 old mode 100755 new mode 100644 diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore old mode 100755 new mode 100644 -- cgit v1.2.1