Version 1.58.1

8 files changed, 23 insertions, 28 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 329364f60..a5d791b2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Gitaly changelog
 
+## v1.58.1
+
+#### Added
+- Port GetCommitSignatures to Go
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1283
+
+#### Other
+- Update gitlab-labkit to 0.4.2
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1412
+
+#### Performance
+- Enable disk cache invalidator gRPC interceptors
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1373
+
+#### Security
+- Bump nokogiri to 1.10.4
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1415
+- Fix FindCommits flag injection exploit
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/31
+
 ## v1.58.0
 
 #### Fixed
diff --git a/VERSION b/VERSION
index 79f82f6b8..69478d187 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.58.0
+1.58.1
diff --git a/changelogs/unreleased/bump_nokogiri-1-10-4.yml b/changelogs/unreleased/bump_nokogiri-1-10-4.yml
deleted file mode 100644
index 3dbacfdd9..000000000
--- a/changelogs/unreleased/bump_nokogiri-1-10-4.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump nokogiri to 1.10.4
-merge_request: 1415
-author:
-type: security
diff --git a/changelogs/unreleased/issue_1604.yml b/changelogs/unreleased/issue_1604.yml
deleted file mode 100644
index 71f44be92..000000000
--- a/changelogs/unreleased/issue_1604.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Port GetCommitSignatures to Go
-merge_request: 1283
-author:
-type: added
diff --git a/changelogs/unreleased/po-enable-cache-invalidators.yml b/changelogs/unreleased/po-enable-cache-invalidators.yml
deleted file mode 100644
index 421dea90d..000000000
--- a/changelogs/unreleased/po-enable-cache-invalidators.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Enable disk cache invalidator gRPC interceptors
-merge_request: 1373
-author:
-type: performance
diff --git a/changelogs/unreleased/security-1799-flag-injection.yml b/changelogs/unreleased/security-1799-flag-injection.yml
deleted file mode 100644
index 63f6176ba..000000000
--- a/changelogs/unreleased/security-1799-flag-injection.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix FindCommits flag injection exploit
-merge_request: 31
-author:
-type: security
diff --git a/changelogs/unreleased/sh-update-ruby-labkit.yml b/changelogs/unreleased/sh-update-ruby-labkit.yml
deleted file mode 100644
index 2a07657ce..000000000
--- a/changelogs/unreleased/sh-update-ruby-labkit.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update gitlab-labkit to 0.4.2
-merge_request: 1412
-author:
-type: other
diff --git a/ruby/proto/gitaly/version.rb b/ruby/proto/gitaly/version.rb
index 10013f254..4f1be3f75 100644
--- a/ruby/proto/gitaly/version.rb
+++ b/ruby/proto/gitaly/version.rb
@@ -1,4 +1,4 @@
-# This file was auto-generated by /Users/jacobvosmaer/Desktop/gitlab-development-kit/gitaly/src/gitlab.com/gitlab-org/gitaly/_support/release
+# This file was auto-generated by _support/release
 module Gitaly
-  VERSION = '1.58.0'
+  VERSION = '1.58.1'
 end