Update CHANGELOG.md for 13.5.0

[ci skip]

33 files changed, 50 insertions, 160 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d95ce0b18..bc0a7a47b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,55 @@
 # Gitaly changelog
 
+## 13.5.0 (2020-10-22)
+
+### Fixed (9 changes)
+
+- Pass correlation ID to hooks. !2576
+- transactions: Correctly handle cancellation of empty transactions. !2594
+- Ensure local branches are current when syncing remote mirrors. !2606
+- Fix injection of gitaly servers info. !2615
+- Verification of gitaly-ssh runs. !2616
+- git: Fix parsing of dashed -rc versions. !2639
+- hook: Stop transactions on pre-receive hook failure. !2643
+- Doubled invocation of gitaly-ssh on upload pack cmd. !2645
+- operations: Fix PostReceive hook receiving no input. !2653
+
+### Changed (6 changes)
+
+- transactions: Only vote when reftx hook is in prepared state. !2571
+- transactions: Remove voting via pre-receive hook. !2578
+- linguist: Bump version for better detection. !2591
+- transactions: Remove service-specific feature flags. !2599
+- Disabling of reads distribution feature. !2619
+- Send CORRELATION_ID to gitaly-lfs-smudge filter. !2662
+
+### Performance (2 changes)
+
+- Port operations.UserMergeToRef to Go. !2580
+- conflicts: Port ListConflictFiles to Go. !2598
+
+### Added (9 changes)
+
+- transactions: Implement RPC to gracefully stop transactions. !2532
+- Add Git LFS smudge filter. !2577
+- git2go: Implement new command to list merge conflicts. !2587
+- PostgreSQL notifications listener. !2603
+- Add include_lfs_blobs flag in GetArchiveRequest RPC. !2607
+- Add support for using LFS smudge filter. !2621
+- Port UserSquash to Go. !2623
+- Add option to include conflict markers to merge commit. !2626
+- Per-connection gRPC options in client. !2630
+
+### Other (6 changes)
+
+- Reference hook option for Git command DSL. !2596
+- Update json gem to v2.3.1. !2610
+- Fix Ruby 2.7 keyword deprecation deprecation warnings. !2611
+- Refactor server metadata to be more type safe. !2624
+- Remote repository abstraction for resolving refish. !2629
+- Upgrade Rubocop to 0.86.0. !2634
+
+
 ## 13.4.4 (2020-10-15)
 
 - No changes.
diff --git a/changelogs/unreleased/ash2k-dial-opts-func.yml b/changelogs/unreleased/ash2k-dial-opts-func.yml
deleted file mode 100644
index 7727ccd48..000000000
--- a/changelogs/unreleased/ash2k-dial-opts-func.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Per-connection gRPC options in client
-merge_request: 2630
-author:
-type: added
diff --git a/changelogs/unreleased/id-allow-conflicts-on-merge.yml b/changelogs/unreleased/id-allow-conflicts-on-merge.yml
deleted file mode 100644
index 22d6c7582..000000000
--- a/changelogs/unreleased/id-allow-conflicts-on-merge.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add option to include conflict markers to merge commit
-merge_request: 2626
-author:
-type: added
diff --git a/changelogs/unreleased/pks-git-version-dashed-rcs.yml b/changelogs/unreleased/pks-git-version-dashed-rcs.yml
deleted file mode 100644
index 315db593c..000000000
--- a/changelogs/unreleased/pks-git-version-dashed-rcs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'git: Fix parsing of dashed -rc versions'
-merge_request: 2639
-author:
-type: fixed
diff --git a/changelogs/unreleased/pks-git2go-merge-conflicts.yml b/changelogs/unreleased/pks-git2go-merge-conflicts.yml
deleted file mode 100644
index 56f72c881..000000000
--- a/changelogs/unreleased/pks-git2go-merge-conflicts.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'git2go: Implement new command to list merge conflicts'
-merge_request: 2587
-author:
-type: added
diff --git a/changelogs/unreleased/pks-go-list-conflict-files.yml b/changelogs/unreleased/pks-go-list-conflict-files.yml
deleted file mode 100644
index bbbb37487..000000000
--- a/changelogs/unreleased/pks-go-list-conflict-files.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'conflicts: Port ListConflictFiles to Go'
-merge_request: 2598
-author:
-type: performance
diff --git a/changelogs/unreleased/pks-go-user-merge-to-ref.yml b/changelogs/unreleased/pks-go-user-merge-to-ref.yml
deleted file mode 100644
index 4a206a734..000000000
--- a/changelogs/unreleased/pks-go-user-merge-to-ref.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Port operations.UserMergeToRef to Go
-merge_request: 2580
-author:
-type: performance
diff --git a/changelogs/unreleased/pks-hook-stop-transaction.yml b/changelogs/unreleased/pks-hook-stop-transaction.yml
deleted file mode 100644
index 656a5d2ca..000000000
--- a/changelogs/unreleased/pks-hook-stop-transaction.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'hook: Stop transactions on pre-receive hook failure'
-merge_request: 2643
-author:
-type: fixed
diff --git a/changelogs/unreleased/pks-reftx-dup-votes.yml b/changelogs/unreleased/pks-reftx-dup-votes.yml
deleted file mode 100644
index c4cffd264..000000000
--- a/changelogs/unreleased/pks-reftx-dup-votes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'transactions: Only vote when reftx hook is in prepared state'
-merge_request: 2571
-author:
-type: changed
diff --git a/changelogs/unreleased/pks-transaction-remove-prereceive-voting.yml b/changelogs/unreleased/pks-transaction-remove-prereceive-voting.yml
deleted file mode 100644
index 912a8cc09..000000000
--- a/changelogs/unreleased/pks-transaction-remove-prereceive-voting.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'transactions: Remove voting via pre-receive hook'
-merge_request: 2578
-author:
-type: changed
diff --git a/changelogs/unreleased/pks-transaction-stop.yml b/changelogs/unreleased/pks-transaction-stop.yml
deleted file mode 100644
index fa4dba282..000000000
--- a/changelogs/unreleased/pks-transaction-stop.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'transactions: Implement RPC to gracefully stop transactions'
-merge_request: 2532
-author:
-type: added
diff --git a/changelogs/unreleased/pks-tx-empty-transaction-cancellation.yml b/changelogs/unreleased/pks-tx-empty-transaction-cancellation.yml
deleted file mode 100644
index 25817e926..000000000
--- a/changelogs/unreleased/pks-tx-empty-transaction-cancellation.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'transactions: Correctly handle cancellation of empty transactions'
-merge_request: 2594
-author:
-type: fixed
diff --git a/changelogs/unreleased/pks-tx-remove-service-feature-flags.yml b/changelogs/unreleased/pks-tx-remove-service-feature-flags.yml
deleted file mode 100644
index d4a7304aa..000000000
--- a/changelogs/unreleased/pks-tx-remove-service-feature-flags.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'transactions: Remove service-specific feature flags'
-merge_request: 2599
-author:
-type: changed
diff --git a/changelogs/unreleased/pks-user-merge-branch-post-receive-hook.yml b/changelogs/unreleased/pks-user-merge-branch-post-receive-hook.yml
deleted file mode 100644
index 7dd7030f4..000000000
--- a/changelogs/unreleased/pks-user-merge-branch-post-receive-hook.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'operations: Fix PostReceive hook receiving no input'
-merge_request: 2653
-author:
-type: fixed
diff --git a/changelogs/unreleased/po-ref-hook-opt.yml b/changelogs/unreleased/po-ref-hook-opt.yml
deleted file mode 100644
index 4b1a9b012..000000000
--- a/changelogs/unreleased/po-ref-hook-opt.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Reference hook option for Git command DSL
-merge_request: 2596
-author:
-type: other
diff --git a/changelogs/unreleased/po-refacto-server-metadata.yml b/changelogs/unreleased/po-refacto-server-metadata.yml
deleted file mode 100644
index e6432875b..000000000
--- a/changelogs/unreleased/po-refacto-server-metadata.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Refactor server metadata to be more type safe
-merge_request: 2624
-author:
-type: other
diff --git a/changelogs/unreleased/po-remote-repo-resolve-refish.yml b/changelogs/unreleased/po-remote-repo-resolve-refish.yml
deleted file mode 100644
index 003ec9ebd..000000000
--- a/changelogs/unreleased/po-remote-repo-resolve-refish.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remote repository abstraction for resolving refish
-merge_request: 2629
-author:
-type: other
diff --git a/changelogs/unreleased/ps-disable-reads-distribution.yml b/changelogs/unreleased/ps-disable-reads-distribution.yml
deleted file mode 100644
index 47f3d2a27..000000000
--- a/changelogs/unreleased/ps-disable-reads-distribution.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Disabling of reads distribution feature
-merge_request: 2619
-author:
-type: changed
diff --git a/changelogs/unreleased/ps-fix-inject-gitalies.yml b/changelogs/unreleased/ps-fix-inject-gitalies.yml
deleted file mode 100644
index 0bdd05b5a..000000000
--- a/changelogs/unreleased/ps-fix-inject-gitalies.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix injection of gitaly servers info
-merge_request: 2615
-author:
-type: fixed
diff --git a/changelogs/unreleased/ps-gitaly-ssh-upload-pack.yml b/changelogs/unreleased/ps-gitaly-ssh-upload-pack.yml
deleted file mode 100644
index 24ae44f6c..000000000
--- a/changelogs/unreleased/ps-gitaly-ssh-upload-pack.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Doubled invocation of gitaly-ssh on upload pack cmd.
-merge_request: 2645
-author:
-type: fixed
diff --git a/changelogs/unreleased/ps-postgres-listener.yml b/changelogs/unreleased/ps-postgres-listener.yml
deleted file mode 100644
index 38ce4a36b..000000000
--- a/changelogs/unreleased/ps-postgres-listener.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: PostgreSQL notifications listener
-merge_request: 2603
-author:
-type: added
diff --git a/changelogs/unreleased/ps-user-squash-go.yml b/changelogs/unreleased/ps-user-squash-go.yml
deleted file mode 100644
index 1f449712d..000000000
--- a/changelogs/unreleased/ps-user-squash-go.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Port UserSquash to Go
-merge_request: 2623
-author:
-type: added
diff --git a/changelogs/unreleased/ps-verify-gitaly-ssh-called.yml b/changelogs/unreleased/ps-verify-gitaly-ssh-called.yml
deleted file mode 100644
index 6dbfb137b..000000000
--- a/changelogs/unreleased/ps-verify-gitaly-ssh-called.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Verification of gitaly-ssh runs.
-merge_request: 2616
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-add-include-lfs-flag-archive.yml b/changelogs/unreleased/sh-add-include-lfs-flag-archive.yml
deleted file mode 100644
index 1e83bd5f6..000000000
--- a/changelogs/unreleased/sh-add-include-lfs-flag-archive.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add include_lfs_blobs flag in GetArchiveRequest RPC
-merge_request: 2607
-author:
-type: added
diff --git a/changelogs/unreleased/sh-correlation-id-lfs-smudge.yml b/changelogs/unreleased/sh-correlation-id-lfs-smudge.yml
deleted file mode 100644
index 8395e52fb..000000000
--- a/changelogs/unreleased/sh-correlation-id-lfs-smudge.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Send CORRELATION_ID to gitaly-lfs-smudge filter
-merge_request: 2662
-author:
-type: changed
diff --git a/changelogs/unreleased/sh-fix-ruby-2-7-kwargs-deprecations.yml b/changelogs/unreleased/sh-fix-ruby-2-7-kwargs-deprecations.yml
deleted file mode 100644
index f393eb962..000000000
--- a/changelogs/unreleased/sh-fix-ruby-2-7-kwargs-deprecations.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Ruby 2.7 keyword deprecation deprecation warnings
-merge_request: 2611
-author:
-type: other
diff --git a/changelogs/unreleased/sh-gitaly-lfs-smudge-activate.yml b/changelogs/unreleased/sh-gitaly-lfs-smudge-activate.yml
deleted file mode 100644
index 98a64dbd4..000000000
--- a/changelogs/unreleased/sh-gitaly-lfs-smudge-activate.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add support for using LFS smudge filter
-merge_request: 2621
-author:
-type: added
diff --git a/changelogs/unreleased/sh-gitaly-lfs-smudge-filter.yml b/changelogs/unreleased/sh-gitaly-lfs-smudge-filter.yml
deleted file mode 100644
index 22611994c..000000000
--- a/changelogs/unreleased/sh-gitaly-lfs-smudge-filter.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add Git LFS smudge filter
-merge_request: 2577
-author:
-type: added
diff --git a/changelogs/unreleased/sh-pass-correlation-id-to-hooks.yml b/changelogs/unreleased/sh-pass-correlation-id-to-hooks.yml
deleted file mode 100644
index a333d182e..000000000
--- a/changelogs/unreleased/sh-pass-correlation-id-to-hooks.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Pass correlation ID to hooks
-merge_request: 2576
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-remote-branch-load-first.yml b/changelogs/unreleased/sh-remote-branch-load-first.yml
deleted file mode 100644
index fe89370e0..000000000
--- a/changelogs/unreleased/sh-remote-branch-load-first.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Ensure local branches are current when syncing remote mirrors
-merge_request: 2606
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-update-json-gem.yml b/changelogs/unreleased/sh-update-json-gem.yml
deleted file mode 100644
index 2c8aa8757..000000000
--- a/changelogs/unreleased/sh-update-json-gem.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update json gem to v2.3.1
-merge_request: 2610
-author:
-type: other
diff --git a/changelogs/unreleased/sh-upgrade-rubocop.yml b/changelogs/unreleased/sh-upgrade-rubocop.yml
deleted file mode 100644
index 370deef16..000000000
--- a/changelogs/unreleased/sh-upgrade-rubocop.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade Rubocop to 0.86.0
-merge_request: 2634
-author:
-type: other
diff --git a/changelogs/unreleased/zj-bump-linguist.yml b/changelogs/unreleased/zj-bump-linguist.yml
deleted file mode 100644
index c30138172..000000000
--- a/changelogs/unreleased/zj-bump-linguist.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'linguist: Bump version for better detection'
-merge_request: 2591
-author:
-type: changed