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:
authorJacob Vosmaer <jacob@gitlab.com>2019-07-26 15:50:38 +0300
committerJacob Vosmaer <jacob@gitlab.com>2019-07-26 15:50:38 +0300
commitf6e151f5b8189eadbe0063d8fe1c2b1371085b64 (patch)
tree4291a4dfb3098d237a4b21f6fee39c1699129089
parentcda29b1a25c9762ab59c2d8478663691f6e80993 (diff)
Version 1.42.6v1.42.6
-rw-r--r--CHANGELOG.md8
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/1-42-6-1.yml5
-rw-r--r--changelogs/unreleased/1-42-6-2.yml5
4 files changed, 9 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18977cf4d..d4570ef1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
# Gitaly changelog
+## v1.42.6
+
+#### Security
+- Add http.followRedirects directive to `git fetch` command
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/
+- Do not follow redirect when cloning repo from URL
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/
+
## v1.42.5
diff --git a/VERSION b/VERSION
index c39f63b9e..5f1d262b9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.42.5
+1.42.6
diff --git a/changelogs/unreleased/1-42-6-1.yml b/changelogs/unreleased/1-42-6-1.yml
deleted file mode 100644
index 6b595f5d5..000000000
--- a/changelogs/unreleased/1-42-6-1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add http.followRedirects directive to `git fetch` command
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/1-42-6-2.yml b/changelogs/unreleased/1-42-6-2.yml
deleted file mode 100644
index 13b1e9c5f..000000000
--- a/changelogs/unreleased/1-42-6-2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Do not follow redirect when cloning repo from URL
-merge_request:
-author:
-type: security