Version 1.36.0v1.36.0

15 files changed, 39 insertions, 66 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ecd5bd21..b9d017c5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,43 @@
 # Gitaly changelog
 
+## v1.36.0
+
+#### Added
+- adding ProtoRegistry
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1188
+- Adding FetchIntoObjectPool RPC
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1172
+- Add new two-step UserRebaseConfirmable RPC
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1208
+
+#### Fixed
+- Include stderr in err returned by git.Command Wait()
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1167
+- Use 3-way merge for squashing commits
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1214
+- Close logrus writer when command finishes
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1225
+
+#### Other
+- Bump Ruby bundler version to 1.17.3
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1215
+- Upgrade Ruby gRPC 1.19.0 and protobuf to 3.7.1
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1066
+- Ensure pool exists in LinkRepositoryToObjectPool rpc
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1222
+- Update FetchRemote ruby to write http auth as well as add remote
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1126
+
+#### Performance
+- GarbageCollect RPC writes commit graph and enables via config
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1218
+
+#### Security
+- Bump Nokogiri to 1.10.3
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1217
+- Loosen regex for exception sanitization
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/25
+
 ## v1.35.0
 
 
diff --git a/VERSION b/VERSION
index 2aeaa11ee..39fc130ef 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.35.0
+1.36.0
diff --git a/changelogs/unreleased/add-new-rebase.yml b/changelogs/unreleased/add-new-rebase.yml
deleted file mode 100644
index 593b1477e..000000000
--- a/changelogs/unreleased/add-new-rebase.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add new two-step UserRebaseConfirmable RPC
-merge_request: 1208
-author:
-type: added
diff --git a/changelogs/unreleased/jc-add-fetch-into-object-pool.yml b/changelogs/unreleased/jc-add-fetch-into-object-pool.yml
deleted file mode 100644
index 78438dfa2..000000000
--- a/changelogs/unreleased/jc-add-fetch-into-object-pool.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Adding FetchIntoObjectPool RPC
-merge_request: 1172
-author:
-type: added
diff --git a/changelogs/unreleased/jc-add-stderr-to-err.yml b/changelogs/unreleased/jc-add-stderr-to-err.yml
deleted file mode 100644
index 3418311c0..000000000
--- a/changelogs/unreleased/jc-add-stderr-to-err.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Include stderr in err returned by git.Command Wait()
-merge_request: 1167
-author:
-type: fixed
diff --git a/changelogs/unreleased/jc-close-logruswriter.yml b/changelogs/unreleased/jc-close-logruswriter.yml
deleted file mode 100644
index 4516aefd3..000000000
--- a/changelogs/unreleased/jc-close-logruswriter.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Close logrus writer when command finishes
-merge_request: 1225
-author:
-type: fixed
diff --git a/changelogs/unreleased/jc-ensure-pool-exists-before-linking.yml b/changelogs/unreleased/jc-ensure-pool-exists-before-linking.yml
deleted file mode 100644
index 514e90a4d..000000000
--- a/changelogs/unreleased/jc-ensure-pool-exists-before-linking.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Ensure pool exists in LinkRepositoryToObjectPool rpc
-merge_request: 1222
-author:
-type: other
diff --git a/changelogs/unreleased/jc-geo-fetch.yml b/changelogs/unreleased/jc-geo-fetch.yml
deleted file mode 100644
index 6b9aad103..000000000
--- a/changelogs/unreleased/jc-geo-fetch.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update FetchRemote ruby to write http auth as well as add remote
-merge_request: 1126
-author:
-type: other
diff --git a/changelogs/unreleased/jc-praefect-proto-registry.yml b/changelogs/unreleased/jc-praefect-proto-registry.yml
deleted file mode 100644
index 118c041fd..000000000
--- a/changelogs/unreleased/jc-praefect-proto-registry.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: adding ProtoRegistry
-merge_request: 1188
-author:
-type: added
diff --git a/changelogs/unreleased/loosen_regex_for_exception_sanitization.yml b/changelogs/unreleased/loosen_regex_for_exception_sanitization.yml
deleted file mode 100644
index 4a2be5735..000000000
--- a/changelogs/unreleased/loosen_regex_for_exception_sanitization.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Loosen regex for exception sanitization
-merge_request: 25
-author:
-type: security
diff --git a/changelogs/unreleased/po_commit_graph.yml b/changelogs/unreleased/po_commit_graph.yml
deleted file mode 100644
index 8e1564b85..000000000
--- a/changelogs/unreleased/po_commit_graph.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: GarbageCollect RPC writes commit graph and enables via config
-merge_request: 1218
-author:
-type: performance
diff --git a/changelogs/unreleased/sh-bump-bundler-version.yml b/changelogs/unreleased/sh-bump-bundler-version.yml
deleted file mode 100644
index 41a684195..000000000
--- a/changelogs/unreleased/sh-bump-bundler-version.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump Ruby bundler version to 1.17.3
-merge_request: 1215
-author:
-type: other
diff --git a/changelogs/unreleased/sh-bump-grpc-version.yml b/changelogs/unreleased/sh-bump-grpc-version.yml
deleted file mode 100644
index 4672b2048..000000000
--- a/changelogs/unreleased/sh-bump-grpc-version.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade Ruby gRPC 1.19.0 and protobuf to 3.7.1
-merge_request: 1066
-author:
-type: other
diff --git a/changelogs/unreleased/sh-bump-nokogiri-1-10-3.yml b/changelogs/unreleased/sh-bump-nokogiri-1-10-3.yml
deleted file mode 100644
index 39fdc8d79..000000000
--- a/changelogs/unreleased/sh-bump-nokogiri-1-10-3.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump Nokogiri to 1.10.3
-merge_request: 1217
-author:
-type: security
diff --git a/changelogs/unreleased/sh-use-3way-merge-for-squash.yml b/changelogs/unreleased/sh-use-3way-merge-for-squash.yml
deleted file mode 100644
index f7a7b6642..000000000
--- a/changelogs/unreleased/sh-use-3way-merge-for-squash.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use 3-way merge for squashing commits
-merge_request: 1214
-author:
-type: fixed