From aac9da3b144957caca68b1798982b546584a9c59 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Thu, 21 Mar 2019 09:13:32 +0100
Subject: Version 1.29.0

---
 CHANGELOG.md                                    | 16 ++++++++++++++++
 VERSION                                         |  2 +-
 changelogs/unreleased/chomp-bytes.yml           |  5 -----
 changelogs/unreleased/pktline-bytes-written.yml |  5 -----
 changelogs/unreleased/pool-link-no-clobber.yml  |  5 -----
 changelogs/unreleased/re-apply-hooks-change.yml |  5 -----
 changelogs/unreleased/revert-28330762.yml       |  6 ------
 7 files changed, 17 insertions(+), 27 deletions(-)
 delete mode 100644 changelogs/unreleased/chomp-bytes.yml
 delete mode 100644 changelogs/unreleased/pktline-bytes-written.yml
 delete mode 100644 changelogs/unreleased/pool-link-no-clobber.yml
 delete mode 100644 changelogs/unreleased/re-apply-hooks-change.yml
 delete mode 100644 changelogs/unreleased/revert-28330762.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 372c75665..210c754cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Gitaly changelog
 
+## v1.29.0
+
+#### Fixed
+- Fix "bytes written" count in pktline.WriteString
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1129
+- Prevent clobbering existing Git alternates
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1132
+- Revert !1088 "Stop using gitlab-shell hooks -- but keep using gitlab-shell config"
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1117
+
+#### Other
+- Introduce text.ChompBytes helper
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1144
+- Re-apply MR 1088 (Git hooks change)
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1130
+
 ## v1.28.0
 
 Should not be used as it [will break gitlab-rails](https://gitlab.com/gitlab-org/gitlab-ce/issues/58855).
diff --git a/VERSION b/VERSION
index cfc730712..5e57fb895 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.28.0
+1.29.0
diff --git a/changelogs/unreleased/chomp-bytes.yml b/changelogs/unreleased/chomp-bytes.yml
deleted file mode 100644
index 3cc448493..000000000
--- a/changelogs/unreleased/chomp-bytes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Introduce text.ChompBytes helper
-merge_request: 1144
-author:
-type: other
diff --git a/changelogs/unreleased/pktline-bytes-written.yml b/changelogs/unreleased/pktline-bytes-written.yml
deleted file mode 100644
index 8caccbe2d..000000000
--- a/changelogs/unreleased/pktline-bytes-written.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix "bytes written" count in pktline.WriteString
-merge_request: 1129
-author:
-type: fixed
diff --git a/changelogs/unreleased/pool-link-no-clobber.yml b/changelogs/unreleased/pool-link-no-clobber.yml
deleted file mode 100644
index 5fefc327b..000000000
--- a/changelogs/unreleased/pool-link-no-clobber.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prevent clobbering existing Git alternates
-merge_request: 1132
-author:
-type: fixed
diff --git a/changelogs/unreleased/re-apply-hooks-change.yml b/changelogs/unreleased/re-apply-hooks-change.yml
deleted file mode 100644
index 99ce156e7..000000000
--- a/changelogs/unreleased/re-apply-hooks-change.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Re-apply MR 1088 (Git hooks change)
-merge_request: 1130
-author:
-type: other
diff --git a/changelogs/unreleased/revert-28330762.yml b/changelogs/unreleased/revert-28330762.yml
deleted file mode 100644
index 6876d5bab..000000000
--- a/changelogs/unreleased/revert-28330762.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Revert !1088 "Stop using gitlab-shell hooks -- but keep using gitlab-shell
-  config"
-merge_request: 1117
-author:
-type: fixed
-- 
cgit v1.2.3