Version 1.5.0v1.5.0

5 files changed, 15 insertions, 16 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3b10c0bd..bf90bcf6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Gitaly changelog
 
+## v1.5.0
+
+#### Added
+- Add tls configuration to gitaly golang server
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/932
+
+#### Fixed
+- Fix TLS client code on macOS
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/994
+
+#### Other
+- Update to latest goimports formatting
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/993
+
 ## v1.4.0
 
 #### Added
diff --git a/VERSION b/VERSION
index 88c5fb891..bc80560fa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.4.0
+1.5.0
diff --git a/changelogs/unreleased/gitaly-tls.yml b/changelogs/unreleased/gitaly-tls.yml
deleted file mode 100644
index d54147da6..000000000
--- a/changelogs/unreleased/gitaly-tls.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add tls configuration to gitaly golang server
-merge_request: 932
-author:
-type: added
diff --git a/changelogs/unreleased/try-fix-macos-auth-test.yml b/changelogs/unreleased/try-fix-macos-auth-test.yml
deleted file mode 100644
index f58357cd8..000000000
--- a/changelogs/unreleased/try-fix-macos-auth-test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix TLS client code on macOS
-merge_request: 994
-author:
-type: fixed
diff --git a/changelogs/unreleased/update-goimports.yml b/changelogs/unreleased/update-goimports.yml
deleted file mode 100644
index 16ec03b76..000000000
--- a/changelogs/unreleased/update-goimports.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update to latest goimports formatting
-merge_request: 993
-author:
-type: other