Version 1.31.0v1.31.0

8 files changed, 24 insertions, 31 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a41d31594..c186492bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Gitaly changelog
 
+## v1.31.0
+
+#### Added
+- Accept Path option for GetArchive RPC
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1142
+
+#### Changed
+- UnlinkRepositoryFromObjectPool: stop removing objects/info/alternates
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1151
+
+#### Other
+- Always use overlay2 storage driver on Docker build
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1148
+  Contributed by Takuya Noguchi
+- Remove unused Ruby implementation of GetRawChanges
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1169
+- Remove Ruby implementation of remove remote
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1164
+
+#### Removed
+- Drop support for Golang 1.10
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1149
+
 ## v1.30.0
 
 #### Added
diff --git a/VERSION b/VERSION
index 034552a83..34aae156b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.30.0
+1.31.0
diff --git a/changelogs/unreleased/1569-use-overlay2-storage-driver-on-docker.yml b/changelogs/unreleased/1569-use-overlay2-storage-driver-on-docker.yml
deleted file mode 100644
index dc81046b4..000000000
--- a/changelogs/unreleased/1569-use-overlay2-storage-driver-on-docker.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Always use overlay2 storage driver on Docker build
-merge_request: 1148
-author: Takuya Noguchi
-type: other
diff --git a/changelogs/unreleased/24704-get-archive-by-path.yml b/changelogs/unreleased/24704-get-archive-by-path.yml
deleted file mode 100644
index 9defd3fb6..000000000
--- a/changelogs/unreleased/24704-get-archive-by-path.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Accept Path option for GetArchive RPC
-merge_request: 1142
-author:
-type: added
diff --git a/changelogs/unreleased/objectpool-explicit-not-found.yml b/changelogs/unreleased/objectpool-explicit-not-found.yml
deleted file mode 100644
index 30cb6fb96..000000000
--- a/changelogs/unreleased/objectpool-explicit-not-found.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'UnlinkRepositoryFromObjectPool: stop removing objects/info/alternates'
-merge_request: 1151
-author:
-type: changed
diff --git a/changelogs/unreleased/zj-drop-go-1-10.yml b/changelogs/unreleased/zj-drop-go-1-10.yml
deleted file mode 100644
index 73af36673..000000000
--- a/changelogs/unreleased/zj-drop-go-1-10.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Drop support for Golang 1.10
-merge_request: 1149
-author:
-type: removed
diff --git a/changelogs/unreleased/zj-remove-get-raw-changes-ruby.yml b/changelogs/unreleased/zj-remove-get-raw-changes-ruby.yml
deleted file mode 100644
index 0f08c0b87..000000000
--- a/changelogs/unreleased/zj-remove-get-raw-changes-ruby.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove unused Ruby implementation of GetRawChanges
-merge_request: 1169
-author:
-type: other
diff --git a/changelogs/unreleased/zj-remove-remote-ruby-removal.yml b/changelogs/unreleased/zj-remove-remote-ruby-removal.yml
deleted file mode 100644
index d13335c61..000000000
--- a/changelogs/unreleased/zj-remove-remote-ruby-removal.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove Ruby implementation of remove remote
-merge_request: 1164
-author:
-type: other