Update CHANGELOG.md for 13.12.0

[ci skip]

22 files changed, 45 insertions, 105 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa980e61b..c81862b29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,50 @@
 # Gitaly changelog
 
+## 13.12.0 (2021-05-22)
+
+### Security (2 changes, 1 of them is from the community)
+
+- Update golang.org/x/crypto to the latest to address CVE-2020-29652. !3400 (Takuya Noguchi)
+- git: Always check fetched objects for consistency. !3458
+
+### Removed (1 change)
+
+- wiki: Remove FindFile RPC. !3454
+
+### Fixed (8 changes)
+
+- conflicts: Fix use of ambiguous refs in ResolveConflicts. !3386
+- conflicts: Fix fetching from target repository. !3386
+- conflicts: Fix segfault in case unresolved conflicts have no ancestor. !3386
+- conflicts: Fix trailing newline handling when resolving conflicts. !3386
+- Revert commit: Raise error if skipping commit offsets fails. !3390
+- commit: Handle real errors when skipping commits failed. !3392
+- Makefile: Unset PROFILE envvar before building git. !3414
+- ssh: Fix secondaries being out-of-date if all refs are rejected. !3455
+
+### Changed (1 change)
+
+- Use the go implementation of UserRevert by default. !3438
+
+### Performance (4 changes)
+
+- Reduce memory usage in GetAllLFSPointers. !3379
+- blob: Drop LFS pointer bitmap experiment. !3385
+- conflicts: Drop ResolveConflicts feature flag. !3410
+- featureflag: Activate Rebase implementation in Go. !3484
+
+### Added (4 changes)
+
+- Implement repository backups as per backup.rake. !3287
+- gitlab-backup: Restore repositories as per backup.rake. !3383
+- gitlab: Implement metric to measure latency of API calls. !3409
+- remote: Add RemoteUrl parameter to FindRemoteRootRef. !3412
+
+### Other (1 change)
+
+- Multiplex connections between Praefect and Gitaly by default. !3360
+
+
 ## 13.11.4 (2021-05-14)
 
 - No changes.
diff --git a/changelogs/unreleased/3583-golang-org-x-crypto.yml b/changelogs/unreleased/3583-golang-org-x-crypto.yml
deleted file mode 100644
index ea0552182..000000000
--- a/changelogs/unreleased/3583-golang-org-x-crypto.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update golang.org/x/crypto to the latest to address CVE-2020-29652
-merge_request: 3400
-author: Takuya Noguchi
-type: security
diff --git a/changelogs/unreleased/gitaly-backup-restore.yml b/changelogs/unreleased/gitaly-backup-restore.yml
deleted file mode 100644
index ff2fcfb67..000000000
--- a/changelogs/unreleased/gitaly-backup-restore.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'gitlab-backup: Restore repositories as per backup.rake'
-merge_request: 3383
-author:
-type: added
diff --git a/changelogs/unreleased/gitaly-backup.yml b/changelogs/unreleased/gitaly-backup.yml
deleted file mode 100644
index 39e61c7d0..000000000
--- a/changelogs/unreleased/gitaly-backup.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Implement repository backups as per backup.rake
-merge_request: 3287
-author:
-type: added
diff --git a/changelogs/unreleased/jv-lfs-pointer-allocations.yml b/changelogs/unreleased/jv-lfs-pointer-allocations.yml
deleted file mode 100644
index cdb2acfa2..000000000
--- a/changelogs/unreleased/jv-lfs-pointer-allocations.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Reduce memory usage in GetAllLFSPointers
-merge_request: 3379
-author:
-type: performance
diff --git a/changelogs/unreleased/pks-find-commits-skip-offset-error.yml b/changelogs/unreleased/pks-find-commits-skip-offset-error.yml
deleted file mode 100644
index 776fa6f98..000000000
--- a/changelogs/unreleased/pks-find-commits-skip-offset-error.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'commit: Handle real errors when skipping commits failed'
-merge_request: 3392
-author:
-type: fixed
diff --git a/changelogs/unreleased/pks-git-fetch-fsck-objects.yml b/changelogs/unreleased/pks-git-fetch-fsck-objects.yml
deleted file mode 100644
index 463024a92..000000000
--- a/changelogs/unreleased/pks-git-fetch-fsck-objects.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'git: Always check fetched objects for consistency'
-merge_request: 3458
-author:
-type: security
diff --git a/changelogs/unreleased/pks-gitlab-internal-api-latency.yml b/changelogs/unreleased/pks-gitlab-internal-api-latency.yml
deleted file mode 100644
index fc57d7799..000000000
--- a/changelogs/unreleased/pks-gitlab-internal-api-latency.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'gitlab: Implement metric to measure latency of API calls'
-merge_request: 3409
-author:
-type: added
diff --git a/changelogs/unreleased/pks-lfs-pointers-drop-bitmap-experiment.yml b/changelogs/unreleased/pks-lfs-pointers-drop-bitmap-experiment.yml
deleted file mode 100644
index f7ec3d562..000000000
--- a/changelogs/unreleased/pks-lfs-pointers-drop-bitmap-experiment.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'blob: Drop LFS pointer bitmap experiment'
-merge_request: 3385
-author:
-type: performance
diff --git a/changelogs/unreleased/pks-makefile-git-profile.yml b/changelogs/unreleased/pks-makefile-git-profile.yml
deleted file mode 100644
index a113117bc..000000000
--- a/changelogs/unreleased/pks-makefile-git-profile.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Makefile: Unset PROFILE envvar before building git'
-merge_request: 3414
-author:
-type: fixed
diff --git a/changelogs/unreleased/pks-remote-find-root-ref-inmemory-remote.yml b/changelogs/unreleased/pks-remote-find-root-ref-inmemory-remote.yml
deleted file mode 100644
index 3fe24b4d0..000000000
--- a/changelogs/unreleased/pks-remote-find-root-ref-inmemory-remote.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'remote: Add RemoteUrl parameter to FindRemoteRootRef'
-merge_request: 3412
-author:
-type: added
diff --git a/changelogs/unreleased/pks-resolve-conflicts-ambiguous-refs.yml b/changelogs/unreleased/pks-resolve-conflicts-ambiguous-refs.yml
deleted file mode 100644
index 2a9affdaf..000000000
--- a/changelogs/unreleased/pks-resolve-conflicts-ambiguous-refs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'conflicts: Fix use of ambiguous refs in ResolveConflicts'
-merge_request: 3386
-author:
-type: fixed
diff --git a/changelogs/unreleased/pks-resolve-conflicts-drop-ruby-implementation.yml b/changelogs/unreleased/pks-resolve-conflicts-drop-ruby-implementation.yml
deleted file mode 100644
index ea400bfc9..000000000
--- a/changelogs/unreleased/pks-resolve-conflicts-drop-ruby-implementation.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'conflicts: Drop ResolveConflicts feature flag'
-merge_request: 3410
-author:
-type: performance
diff --git a/changelogs/unreleased/pks-resolve-conflicts-fix-fetch-from-target-repository.yml b/changelogs/unreleased/pks-resolve-conflicts-fix-fetch-from-target-repository.yml
deleted file mode 100644
index e4bdb2821..000000000
--- a/changelogs/unreleased/pks-resolve-conflicts-fix-fetch-from-target-repository.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'conflicts: Fix fetching from target repository'
-merge_request: 3386
-author:
-type: fixed
diff --git a/changelogs/unreleased/pks-resolve-conflicts-fix-segfault-with-unresolved-conflicts-wo-ancestor.yml b/changelogs/unreleased/pks-resolve-conflicts-fix-segfault-with-unresolved-conflicts-wo-ancestor.yml
deleted file mode 100644
index 3405e05b1..000000000
--- a/changelogs/unreleased/pks-resolve-conflicts-fix-segfault-with-unresolved-conflicts-wo-ancestor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'conflicts: Fix segfault in case unresolved conflicts have no ancestor'
-merge_request: 3386
-author:
-type: fixed
diff --git a/changelogs/unreleased/pks-resolve-conflicts-trailing-newline.yml b/changelogs/unreleased/pks-resolve-conflicts-trailing-newline.yml
deleted file mode 100644
index ca0a490c2..000000000
--- a/changelogs/unreleased/pks-resolve-conflicts-trailing-newline.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'conflicts: Fix trailing newline handling when resolving conflicts'
-merge_request: 3386
-author:
-type: fixed
diff --git a/changelogs/unreleased/pks-ssh-receive-pack-voting.yml b/changelogs/unreleased/pks-ssh-receive-pack-voting.yml
deleted file mode 100644
index 12ad4186f..000000000
--- a/changelogs/unreleased/pks-ssh-receive-pack-voting.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'ssh: Fix secondaries being out-of-date if all refs are rejected'
-merge_request: 3455
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-revert-find-commits-offset-error-check.yml b/changelogs/unreleased/sh-revert-find-commits-offset-error-check.yml
deleted file mode 100644
index e8ee84bea..000000000
--- a/changelogs/unreleased/sh-revert-find-commits-offset-error-check.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Revert commit: Raise error if skipping commit offsets fails'
-merge_request: 3390
-author:
-type: fixed
diff --git a/changelogs/unreleased/smh-mux-by-default.yml b/changelogs/unreleased/smh-mux-by-default.yml
deleted file mode 100644
index 2db9687fa..000000000
--- a/changelogs/unreleased/smh-mux-by-default.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Multiplex connections between Praefect and Gitaly by default
-merge_request: 3360
-author:
-type: other
diff --git a/changelogs/unreleased/tc-default-enable-go-rebase.yml b/changelogs/unreleased/tc-default-enable-go-rebase.yml
deleted file mode 100644
index 77c782fb1..000000000
--- a/changelogs/unreleased/tc-default-enable-go-rebase.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'featureflag: Activate Rebase implementation in Go'
-merge_request: 3484
-author:
-type: performance
diff --git a/changelogs/unreleased/user_revert_default.yml b/changelogs/unreleased/user_revert_default.yml
deleted file mode 100644
index c62e4e35f..000000000
--- a/changelogs/unreleased/user_revert_default.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use the go implementation of UserRevert by default
-merge_request: 3438
-author:
-type: changed
diff --git a/changelogs/unreleased/zj-remove-wiki-find-file.yml b/changelogs/unreleased/zj-remove-wiki-find-file.yml
deleted file mode 100644
index 3465c2f1c..000000000
--- a/changelogs/unreleased/zj-remove-wiki-find-file.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'wiki: Remove FindFile RPC'
-merge_request: 3454
-author:
-type: removed