Version 1.15.0v1.15.0

11 files changed, 31 insertions, 46 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5697fbb7..4b8834bc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # Gitaly changelog
 
+## v1.15.0
+
+#### Added
+- Support rbtrace and ObjectSpace via environment flags
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1046
+
+#### Changed
+- Add CountDivergingCommits RPC
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1023
+
+#### Fixed
+- Add chunking support to SearchFilesByContent RPC
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1015
+- Avoid unsafe use of scanner.Bytes() in ref name RPC's
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1054
+- Fix tests that used long unix socket paths
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1039
+
+#### Other
+- Use chunker for ListDirectories RPC
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1042
+- Stop using nil internally to signal "commit not found"
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1050
+- Refactor refnames RPC's to use chunker
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1041
+
+#### Performance
+- Rewrite CommitStats in Go
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1048
+
 ## v1.14.0
 
 #### Fixed
diff --git a/VERSION b/VERSION
index 850e74240..141f2e805 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.14.0
+1.15.0
diff --git a/changelogs/unreleased/1473-refnames-bug.yml b/changelogs/unreleased/1473-refnames-bug.yml
deleted file mode 100644
index b44475a43..000000000
--- a/changelogs/unreleased/1473-refnames-bug.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Avoid unsafe use of scanner.Bytes() in ref name RPC's
-merge_request: 1054
-author:
-type: fixed
diff --git a/changelogs/unreleased/add-chunking-for-search-files-by-content.yml b/changelogs/unreleased/add-chunking-for-search-files-by-content.yml
deleted file mode 100644
index d03b8d952..000000000
--- a/changelogs/unreleased/add-chunking-for-search-files-by-content.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add chunking support to SearchFilesByContent RPC
-merge_request: 1015
-author:
-type: fixed
diff --git a/changelogs/unreleased/add-left-right-support.yml b/changelogs/unreleased/add-left-right-support.yml
deleted file mode 100644
index ec17079c3..000000000
--- a/changelogs/unreleased/add-left-right-support.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add CountDivergingCommits RPC
-merge_request: 1023
-author:
-type: changed
diff --git a/changelogs/unreleased/add-rbtrace-and-objspace-support.yml b/changelogs/unreleased/add-rbtrace-and-objspace-support.yml
deleted file mode 100644
index facf62924..000000000
--- a/changelogs/unreleased/add-rbtrace-and-objspace-support.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Support rbtrace and ObjectSpace via environment flags
-merge_request: 1046
-author:
-type: added
diff --git a/changelogs/unreleased/commitstats-go.yml b/changelogs/unreleased/commitstats-go.yml
deleted file mode 100644
index 70e97d691..000000000
--- a/changelogs/unreleased/commitstats-go.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Rewrite CommitStats in Go
-merge_request: 1048
-author:
-type: performance
diff --git a/changelogs/unreleased/fix-unix-socket-tests.yml b/changelogs/unreleased/fix-unix-socket-tests.yml
deleted file mode 100644
index e9cc4312c..000000000
--- a/changelogs/unreleased/fix-unix-socket-tests.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix tests that used long unix socket paths
-merge_request: 1039
-author:
-type: fixed
diff --git a/changelogs/unreleased/listdirectories-chunker.yml b/changelogs/unreleased/listdirectories-chunker.yml
deleted file mode 100644
index 748dc902b..000000000
--- a/changelogs/unreleased/listdirectories-chunker.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use chunker for ListDirectories RPC
-merge_request: 1042
-author:
-type: other
diff --git a/changelogs/unreleased/log-get-commit-not-found.yml b/changelogs/unreleased/log-get-commit-not-found.yml
deleted file mode 100644
index c8248982f..000000000
--- a/changelogs/unreleased/log-get-commit-not-found.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Stop using nil internally to signal "commit not found"
-merge_request: 1050
-author:
-type: other
diff --git a/changelogs/unreleased/refactor-refnames-chunker.yml b/changelogs/unreleased/refactor-refnames-chunker.yml
deleted file mode 100644
index 56962b510..000000000
--- a/changelogs/unreleased/refactor-refnames-chunker.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Refactor refnames RPC's to use chunker
-merge_request: 1041
-author:
-type: other