Version 1.23.0v1.23.0

12 files changed, 29 insertions, 51 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a20270c8..34c922497 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Gitaly changelog
 
+## v1.23.0
+
+#### Added
+- Allow debugging ruby tests with pry
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1102
+- Create Praefect binary for proxy server execution
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1068
+
+#### Fixed
+- Try to resolve flaky TestRemoval balancer test
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1094
+- Bump Rugged to 0.28.0
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/
+
+#### Other
+- Remove unused Ruby implementation for CommitStats
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1092
+- GitalyBot will apply labels to merge requests
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1105
+- Remove non-chunked code path for SearchFilesByContent
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1100
+- Remove ruby implementation of find commits
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1099
+- Update Gitaly-Proto with protobuf go compiler 1.2
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1084
+- removing deprecated ruby write-ref
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1098
+
 ## v1.22.0
 
 #### Fixed
diff --git a/VERSION b/VERSION
index 57807d6d0..a6c2798a4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.22.0
+1.23.0
diff --git a/changelogs/unreleased/allow-developers-to-debug-ruby-with-pry.yml b/changelogs/unreleased/allow-developers-to-debug-ruby-with-pry.yml
deleted file mode 100644
index 68fb9594b..000000000
--- a/changelogs/unreleased/allow-developers-to-debug-ruby-with-pry.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow debugging ruby tests with pry
-merge_request: 1102
-author:
-type: added
diff --git a/changelogs/unreleased/jc-remove-ruby-find-commits.yml b/changelogs/unreleased/jc-remove-ruby-find-commits.yml
deleted file mode 100644
index 7d29cb540..000000000
--- a/changelogs/unreleased/jc-remove-ruby-find-commits.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove ruby implementation of find commits
-merge_request: 1099
-author:
-type: other
diff --git a/changelogs/unreleased/jc-remove-ruby-write-ref.yml b/changelogs/unreleased/jc-remove-ruby-write-ref.yml
deleted file mode 100644
index f26a34489..000000000
--- a/changelogs/unreleased/jc-remove-ruby-write-ref.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: removing deprecated ruby write-ref
-merge_request: 1098
-author:
-type: other
diff --git a/changelogs/unreleased/jc-remove-search-files-non-chunked.yml b/changelogs/unreleased/jc-remove-search-files-non-chunked.yml
deleted file mode 100644
index d9fac6427..000000000
--- a/changelogs/unreleased/jc-remove-search-files-non-chunked.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove non-chunked code path for SearchFilesByContent
-merge_request: 1100
-author:
-type: other
diff --git a/changelogs/unreleased/jv-flaky-balancer-test.yml b/changelogs/unreleased/jv-flaky-balancer-test.yml
deleted file mode 100644
index 001f50cc1..000000000
--- a/changelogs/unreleased/jv-flaky-balancer-test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Try to resolve flaky TestRemoval balancer test
-merge_request: 1094
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-bump-rugged-0-28-0.yml b/changelogs/unreleased/sh-bump-rugged-0-28-0.yml
deleted file mode 100644
index e5cb7a1e3..000000000
--- a/changelogs/unreleased/sh-bump-rugged-0-28-0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump Rugged to 0.28.0
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/zj-danger-label-apply.yml b/changelogs/unreleased/zj-danger-label-apply.yml
deleted file mode 100644
index 104b09270..000000000
--- a/changelogs/unreleased/zj-danger-label-apply.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: GitalyBot will apply labels to merge requests
-merge_request: 1105
-author:
-type: other
diff --git a/changelogs/unreleased/zj-praefect.yml b/changelogs/unreleased/zj-praefect.yml
deleted file mode 100644
index 1960bd14b..000000000
--- a/changelogs/unreleased/zj-praefect.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Create Praefect binary for proxy server execution
-merge_request: 1068
-author:
-type: added
diff --git a/changelogs/unreleased/zj-remove-dead-commmit-stats-ruby.yml b/changelogs/unreleased/zj-remove-dead-commmit-stats-ruby.yml
deleted file mode 100644
index 24e4c4d40..000000000
--- a/changelogs/unreleased/zj-remove-dead-commmit-stats-ruby.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove unused Ruby implementation for CommitStats
-merge_request: 1092
-author:
-type: other
diff --git a/changelogs/unreleased/zj-upgrade-protobuf-go-1-2.yml b/changelogs/unreleased/zj-upgrade-protobuf-go-1-2.yml
deleted file mode 100644
index ebcd46ebb..000000000
--- a/changelogs/unreleased/zj-upgrade-protobuf-go-1-2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update Gitaly-Proto with protobuf go compiler 1.2
-merge_request: 1084
-author:
-type: other