From f13c6c0da5d7bebe8bcaf58ffb4b3525ff590041 Mon Sep 17 00:00:00 2001 From: John Cai Date: Thu, 23 May 2019 10:00:04 -0700 Subject: Version 1.42.2 --- CHANGELOG.md | 6 ++++++ VERSION | 2 +- changelogs/unreleased/jc-fix-get-archive.yml | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 changelogs/unreleased/jc-fix-get-archive.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 931a5314d..4944f4612 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Gitaly changelog +## v1.42.2 + +#### Security +- Fix GetArchive injection vulnerability + https://gitlab.com/gitlab-org/gitaly/merge_requests/27 + ## v1.42.1 #### Fixed diff --git a/VERSION b/VERSION index e640847f9..2259c77c0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.42.1 +1.42.2 diff --git a/changelogs/unreleased/jc-fix-get-archive.yml b/changelogs/unreleased/jc-fix-get-archive.yml deleted file mode 100644 index 913cf2b2f..000000000 --- a/changelogs/unreleased/jc-fix-get-archive.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix GetArchive injection vulnerability -merge_request: 27 -author: -type: security -- cgit v1.2.3