Version 1.33.0v1.33.0

9 files changed, 27 insertions, 36 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc273cdda..0a3f6cc69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Gitaly changelog
 
+## v1.33.0
+
+#### Added
+- Zero downtime deployment
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1133
+
+#### Changed
+- Move gitlab-shell out of ruby/vendor
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1173
+
+#### Other
+- Bump Ruby gitaly-proto to v1.19.0
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1186
+- Bump sentry-raven to 2.9.0
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1183
+- Bump gitlab-markup to 1.7.0
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1182
+
+#### Performance
+- Improve GetBlobs performance for fetching lots of files
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1165
+
+#### Security
+- Bump activesupport to 5.0.2.1
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1185
+
 ## v1.32.0
 
 #### Fixed
diff --git a/VERSION b/VERSION
index 359c41089..7aa332e41 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.32.0
+1.33.0
diff --git a/changelogs/unreleased/get-blobs-performance.yml b/changelogs/unreleased/get-blobs-performance.yml
deleted file mode 100644
index 68e152952..000000000
--- a/changelogs/unreleased/get-blobs-performance.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Improve GetBlobs performance for fetching lots of files
-merge_request: 1165
-author:
-type: performance
diff --git a/changelogs/unreleased/gitlab-shell-no-vendor.yml b/changelogs/unreleased/gitlab-shell-no-vendor.yml
deleted file mode 100644
index 80df6e76d..000000000
--- a/changelogs/unreleased/gitlab-shell-no-vendor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move gitlab-shell out of ruby/vendor
-merge_request: 1173
-author:
-type: changed
diff --git a/changelogs/unreleased/sh-bump-activesupport.yml b/changelogs/unreleased/sh-bump-activesupport.yml
deleted file mode 100644
index 09902acd5..000000000
--- a/changelogs/unreleased/sh-bump-activesupport.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump activesupport to 5.0.2.1
-merge_request: 1185
-author:
-type: security
diff --git a/changelogs/unreleased/sh-bump-gitaly-proto-1-19-0.yml b/changelogs/unreleased/sh-bump-gitaly-proto-1-19-0.yml
deleted file mode 100644
index 9df231467..000000000
--- a/changelogs/unreleased/sh-bump-gitaly-proto-1-19-0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump Ruby gitaly-proto to v1.19.0
-merge_request: 1186
-author:
-type: other
diff --git a/changelogs/unreleased/sh-bump-gitlab-markup-1-7-0.yml b/changelogs/unreleased/sh-bump-gitlab-markup-1-7-0.yml
deleted file mode 100644
index f485d0efc..000000000
--- a/changelogs/unreleased/sh-bump-gitlab-markup-1-7-0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump gitlab-markup to 1.7.0
-merge_request: 1182
-author:
-type: other
diff --git a/changelogs/unreleased/sh-bump-sentry-raven-2-9-0.yml b/changelogs/unreleased/sh-bump-sentry-raven-2-9-0.yml
deleted file mode 100644
index 4b1116c46..000000000
--- a/changelogs/unreleased/sh-bump-sentry-raven-2-9-0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump sentry-raven to 2.9.0
-merge_request: 1183
-author:
-type: other
diff --git a/changelogs/unreleased/zero-downtime-deployment.yml b/changelogs/unreleased/zero-downtime-deployment.yml
deleted file mode 100644
index 592d3560b..000000000
--- a/changelogs/unreleased/zero-downtime-deployment.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Zero downtime deployment
-merge_request: 1133
-author:
-type: added