Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Cai <jcai@gitlab.com>2019-05-23 20:00:04 +0300
committerJohn Cai <jcai@gitlab.com>2019-05-23 20:00:04 +0300
commitf13c6c0da5d7bebe8bcaf58ffb4b3525ff590041 (patch)
tree4c69bb2fe79226856feb4edd2a18adee05cded2c
parentebf6133fab1280b1f3137faae02f15aa7a30b50f (diff)
Version 1.42.2v1.42.2
-rw-r--r--CHANGELOG.md6
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/jc-fix-get-archive.yml5
3 files changed, 7 insertions, 6 deletions
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