Version 1.60.0v1.60.0

14 files changed, 39 insertions, 58 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87b0aab5f..5c3ddceef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,41 @@
 # Gitaly changelog
 
+## v1.60.0
+
+#### Added
+- Praefect data model changes with replication
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1399
+- Include process PID in log messages
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1422
+
+#### Changed
+- Make it easier to add new kinds of internal post receive messages
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1410
+
+#### Fixed
+- Validate commitIDs parameter for get_commit_signatures RPC
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1428
+
+#### Other
+- Update ffi gem to 1.11.1
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/
+- Add back old env vars for backwards compatibility
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1367
+- Pass through GOPATH to control cache location
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1436
+
+#### Performance
+- Port GetAllLFSPointers to go
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1414
+- FindTag RPC
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1409
+- Disk cache object directory initial clear
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1424
+
+#### Security
+- Upgrade Rugged to 0.28.3.1
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1427
+
 ## v1.59.0
 
 #### Added
diff --git a/VERSION b/VERSION
index bb120e876..4d5fde5bd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.59.0
+1.60.0
diff --git a/changelogs/unreleased/fix-get-commit-signatures-for-shorthand-commit-shas.yml b/changelogs/unreleased/fix-get-commit-signatures-for-shorthand-commit-shas.yml
deleted file mode 100644
index 2c68c33ab..000000000
--- a/changelogs/unreleased/fix-get-commit-signatures-for-shorthand-commit-shas.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Validate commitIDs parameter for get_commit_signatures RPC
-merge_request: 1428
-author:
-type: fixed
diff --git a/changelogs/unreleased/jc-data-model-changes.yml b/changelogs/unreleased/jc-data-model-changes.yml
deleted file mode 100644
index 89c98dd31..000000000
--- a/changelogs/unreleased/jc-data-model-changes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Praefect data model changes with replication
-merge_request: 1399
-author:
-type: added
diff --git a/changelogs/unreleased/jc-find-tag.yml b/changelogs/unreleased/jc-find-tag.yml
deleted file mode 100644
index 023377cf0..000000000
--- a/changelogs/unreleased/jc-find-tag.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: FindTag RPC
-merge_request: 1409
-author:
-type: performance
diff --git a/changelogs/unreleased/jc-getalllfspointer-go.yml b/changelogs/unreleased/jc-getalllfspointer-go.yml
deleted file mode 100644
index d6c2041cf..000000000
--- a/changelogs/unreleased/jc-getalllfspointer-go.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Port GetAllLFSPointers to go
-merge_request: 1414
-author:
-type: performance
diff --git a/changelogs/unreleased/jc-restore-old-hook-env-var.yml b/changelogs/unreleased/jc-restore-old-hook-env-var.yml
deleted file mode 100644
index 5648f6f6d..000000000
--- a/changelogs/unreleased/jc-restore-old-hook-env-var.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add back old env vars for backwards compatibility
-merge_request: 1367
-author:
-type: other
diff --git a/changelogs/unreleased/jv-logger-pid.yml b/changelogs/unreleased/jv-logger-pid.yml
deleted file mode 100644
index e835aaf0b..000000000
--- a/changelogs/unreleased/jv-logger-pid.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Include process PID in log messages
-merge_request: 1422
-author:
-type: added
diff --git a/changelogs/unreleased/jv-pass-through-gopath.yml b/changelogs/unreleased/jv-pass-through-gopath.yml
deleted file mode 100644
index 754743342..000000000
--- a/changelogs/unreleased/jv-pass-through-gopath.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Pass through GOPATH to control cache location
-merge_request: 1436
-author:
-type: other
diff --git a/changelogs/unreleased/mk-simplify-internal-post-receive-messages.yml b/changelogs/unreleased/mk-simplify-internal-post-receive-messages.yml
deleted file mode 100644
index 7e640ed07..000000000
--- a/changelogs/unreleased/mk-simplify-internal-post-receive-messages.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Make it easier to add new kinds of internal post receive messages
-merge_request: 1410
-author:
-type: changed
diff --git a/changelogs/unreleased/po-cache-init-clear.yml b/changelogs/unreleased/po-cache-init-clear.yml
deleted file mode 100644
index f2f7d1005..000000000
--- a/changelogs/unreleased/po-cache-init-clear.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Disk cache object directory initial clear
-merge_request: 1424
-author:
-type: performance
diff --git a/changelogs/unreleased/sh-update-ffi-gem.yml b/changelogs/unreleased/sh-update-ffi-gem.yml
deleted file mode 100644
index 91f0ee50a..000000000
--- a/changelogs/unreleased/sh-update-ffi-gem.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update ffi gem to 1.11.1
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/sh-update-rugged.yml b/changelogs/unreleased/sh-update-rugged.yml
deleted file mode 100644
index 17189936e..000000000
--- a/changelogs/unreleased/sh-update-rugged.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade Rugged to 0.28.3.1
-merge_request: 1427
-author:
-type: security
diff --git a/ruby/proto/gitaly/version.rb b/ruby/proto/gitaly/version.rb
index 850641314..d0e8aa16c 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
+# This file was auto-generated by /Users/jacobvosmaer/Desktop/gitlab-development-kit/gitaly/src/gitlab.com/gitlab-org/gitaly/_support/release
 module Gitaly
-  VERSION = '1.59.0'
+  VERSION = '1.60.0'
 end