Version 1.80.0v1.80.01-80-stable

7 files changed, 19 insertions, 22 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f06a7b89..e5db2a2d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Gitaly changelog
 
+## v1.80.0
+
+#### Fixed
+- Fix DiskStatistics on OpenBSD
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1728
+  Contributed by bitgestalt
+
+#### Other
+- File walker deletes empty directories
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1721
+- FetchIntoObjectPool: log pool object and ref directory sizes
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1614
+
+#### Performance
+- Add hook rpcs
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1686
+
 ## v1.79.0
 
 #### Changed
diff --git a/VERSION b/VERSION
index b3a8c61e6..aaceec04e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.79.0
+1.80.0
diff --git a/changelogs/unreleased/fix-disk-stats-openbsd.yml b/changelogs/unreleased/fix-disk-stats-openbsd.yml
deleted file mode 100644
index 406fdb51c..000000000
--- a/changelogs/unreleased/fix-disk-stats-openbsd.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix DiskStatistics on OpenBSD
-merge_request: 1728
-author: bitgestalt
-type: fixed
diff --git a/changelogs/unreleased/jc-add-hook-rpcs.yml b/changelogs/unreleased/jc-add-hook-rpcs.yml
deleted file mode 100644
index 78a550468..000000000
--- a/changelogs/unreleased/jc-add-hook-rpcs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add hook rpcs
-merge_request: 1686
-author:
-type: performance
diff --git a/changelogs/unreleased/jv-pool-log-size.yml b/changelogs/unreleased/jv-pool-log-size.yml
deleted file mode 100644
index df661d5f7..000000000
--- a/changelogs/unreleased/jv-pool-log-size.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'FetchIntoObjectPool: log pool object and ref directory sizes'
-merge_request: 1614
-author:
-type: other
diff --git a/changelogs/unreleased/po-diskcache-walker-fix.yml b/changelogs/unreleased/po-diskcache-walker-fix.yml
deleted file mode 100644
index 0f73f882b..000000000
--- a/changelogs/unreleased/po-diskcache-walker-fix.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: File walker deletes empty directories
-merge_request: 1721
-author:
-type: other
diff --git a/ruby/proto/gitaly/version.rb b/ruby/proto/gitaly/version.rb
index a0411e279..b7090f15b 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.79.0'
+  VERSION = '1.80.0'
 end