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-08-22 18:03:01 +0300
committerJacob Vosmaer <jacob@gitlab.com>2019-08-22 18:03:01 +0300
commitc04c53fb54a78d9f81590be7fcec0d7bade9997b (patch)
treede281f7b0e9437dab1046ca431a03d5fc767037d
parent0c20bb6ea26d585308284edeaffc71a0c561607f (diff)
Version 1.61.0v1.61.0
-rw-r--r--CHANGELOG.md8
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/ssrf-fixes.yml5
-rw-r--r--changelogs/unreleased/ssrf-fixes2.yml5
-rw-r--r--ruby/proto/gitaly/version.rb2
5 files changed, 10 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c3ddceef..20910aead 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
# Gitaly changelog
+## v1.61.0
+
+#### Security
+- Do not follow redirect when cloning repo from URL
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/
+- Add http.followRedirects directive to `git fetch` command
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/
+
## v1.60.0
#### Added
diff --git a/VERSION b/VERSION
index 4d5fde5bd..91951fd8a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.60.0
+1.61.0
diff --git a/changelogs/unreleased/ssrf-fixes.yml b/changelogs/unreleased/ssrf-fixes.yml
deleted file mode 100644
index 13b1e9c5f..000000000
--- a/changelogs/unreleased/ssrf-fixes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Do not follow redirect when cloning repo from URL
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/ssrf-fixes2.yml b/changelogs/unreleased/ssrf-fixes2.yml
deleted file mode 100644
index 6b595f5d5..000000000
--- a/changelogs/unreleased/ssrf-fixes2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add http.followRedirects directive to `git fetch` command
-merge_request:
-author:
-type: security
diff --git a/ruby/proto/gitaly/version.rb b/ruby/proto/gitaly/version.rb
index d0e8aa16c..4bb39ff84 100644
--- a/ruby/proto/gitaly/version.rb
+++ b/ruby/proto/gitaly/version.rb
@@ -1,4 +1,4 @@
# This file was auto-generated by /Users/jacobvosmaer/Desktop/gitlab-development-kit/gitaly/src/gitlab.com/gitlab-org/gitaly/_support/release
module Gitaly
- VERSION = '1.60.0'
+ VERSION = '1.61.0'
end