Version 1.50.0v1.50.0

9 files changed, 25 insertions, 36 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a15d3b6c5..a884d2cc9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Gitaly changelog
 
+## v1.50.0
+
+#### Added
+- Use datastore to store the primary node
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1335
+
+#### Fixed
+- Fix default lookup of global custom hooks
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1336
+
+#### Other
+- Add filesystem metadata file on startup
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1289
+- Pass down gitlab-shell log config through env vars
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1293
+- Remove duplication of receive-pack config
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1332
+- Update Prometheus client library
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1329
+
+#### Performance
+- Hide object pools .have refs
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1323
+
 ## v1.49.0
 
 #### Fixed
diff --git a/VERSION b/VERSION
index 7f3a46a84..5a5c7211d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.49.0
+1.50.0
diff --git a/changelogs/unreleased/bjk-prom_v1.yml b/changelogs/unreleased/bjk-prom_v1.yml
deleted file mode 100644
index 70d67074f..000000000
--- a/changelogs/unreleased/bjk-prom_v1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update Prometheus client library
-merge_request: 1329
-author:
-type: other
diff --git a/changelogs/unreleased/jc-filesystem-uuid.yml b/changelogs/unreleased/jc-filesystem-uuid.yml
deleted file mode 100644
index 5fd0244bb..000000000
--- a/changelogs/unreleased/jc-filesystem-uuid.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add filesystem metadata file on startup
-merge_request: 1289
-author:
-type: other
diff --git a/changelogs/unreleased/jc-remove-dependency-on-gitlab-shell-config.yml b/changelogs/unreleased/jc-remove-dependency-on-gitlab-shell-config.yml
deleted file mode 100644
index d4ae0e2cc..000000000
--- a/changelogs/unreleased/jc-remove-dependency-on-gitlab-shell-config.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Pass down gitlab-shell log config through env vars
-merge_request: 1293
-author:
-type: other
diff --git a/changelogs/unreleased/jc-update-datastore-to-contain-primaries.yml b/changelogs/unreleased/jc-update-datastore-to-contain-primaries.yml
deleted file mode 100644
index aebb92ef5..000000000
--- a/changelogs/unreleased/jc-update-datastore-to-contain-primaries.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use datastore to store the primary node
-merge_request: 1335
-author:
-type: added
diff --git a/changelogs/unreleased/jv-dry-alternate-refs.yml b/changelogs/unreleased/jv-dry-alternate-refs.yml
deleted file mode 100644
index 83023f881..000000000
--- a/changelogs/unreleased/jv-dry-alternate-refs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove duplication of receive-pack config
-merge_request: 1332
-author:
-type: other
diff --git a/changelogs/unreleased/jv-fix-custom-global-hooks.yml b/changelogs/unreleased/jv-fix-custom-global-hooks.yml
deleted file mode 100644
index 652dd2682..000000000
--- a/changelogs/unreleased/jv-fix-custom-global-hooks.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix default lookup of global custom hooks
-merge_request: 1336
-author:
-type: fixed
diff --git a/changelogs/unreleased/zj-hide-object-pool-refs.yml b/changelogs/unreleased/zj-hide-object-pool-refs.yml
deleted file mode 100644
index a3a78262b..000000000
--- a/changelogs/unreleased/zj-hide-object-pool-refs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Hide object pools .have refs
-merge_request: 1323
-author:
-type: performance