Version 1.74.0v1.74.01-74-stable

9 files changed, 23 insertions, 32 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8a0faab0..d91200d97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Gitaly changelog
 
+## v1.74.0
+
+#### Added
+- Add DiskStatistics grpc method to ServerService
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1620
+  Contributed by maxmati
+- Add Praefect service
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1628
+
+#### Fixed
+- UpdateRemoteMirror: fix default branch resolution
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1641
+
+#### Other
+- Refactor datastore to its own package
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1627
+- Validate that hook files are reachable and executable
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1574
+- Upgrade charlock_holmes Ruby gem to v0.7.7
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1647
+
 ## v1.73.0
 
 #### Added
diff --git a/VERSION b/VERSION
index 5e3a42566..dc87e8af8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.73.0
+1.74.0
diff --git a/changelogs/unreleased/disk-statistics.yml b/changelogs/unreleased/disk-statistics.yml
deleted file mode 100644
index fc384258d..000000000
--- a/changelogs/unreleased/disk-statistics.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add DiskStatistics grpc method to ServerService
-merge_request: 1620
-author: maxmati
-type: added
diff --git a/changelogs/unreleased/jc-add-hook-existence-check.yml b/changelogs/unreleased/jc-add-hook-existence-check.yml
deleted file mode 100644
index c704c9d81..000000000
--- a/changelogs/unreleased/jc-add-hook-existence-check.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Validate that hook files are reachable and executable
-merge_request: 1574
-author:
-type: other
diff --git a/changelogs/unreleased/jc-add-praefect-service.yml b/changelogs/unreleased/jc-add-praefect-service.yml
deleted file mode 100644
index c91fb6b4d..000000000
--- a/changelogs/unreleased/jc-add-praefect-service.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add Praefect service
-merge_request: 1628
-author:
-type: added
diff --git a/changelogs/unreleased/jc-move-datastore-to-package.yml b/changelogs/unreleased/jc-move-datastore-to-package.yml
deleted file mode 100644
index 95f74e623..000000000
--- a/changelogs/unreleased/jc-move-datastore-to-package.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Refactor datastore to its own package
-merge_request: 1627
-author:
-type: other
diff --git a/changelogs/unreleased/jv-1421.yml b/changelogs/unreleased/jv-1421.yml
deleted file mode 100644
index 1ba394715..000000000
--- a/changelogs/unreleased/jv-1421.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'UpdateRemoteMirror: fix default branch resolution'
-merge_request: 1641
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-upgrade-charlock-holmes.yml b/changelogs/unreleased/sh-upgrade-charlock-holmes.yml
deleted file mode 100644
index 149b9819d..000000000
--- a/changelogs/unreleased/sh-upgrade-charlock-holmes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade charlock_holmes Ruby gem to v0.7.7
-merge_request: 1647
-author:
-type: other
diff --git a/ruby/proto/gitaly/version.rb b/ruby/proto/gitaly/version.rb
index 9ee8ca39f..55a74dc3b 100644
--- a/ruby/proto/gitaly/version.rb
+++ b/ruby/proto/gitaly/version.rb
@@ -1,4 +1,4 @@
 # This file was auto-generated by _support/release
 module Gitaly
-  VERSION = '1.73.0'
+  VERSION = '1.74.0'
 end