Version 1.0.0v1.0.0

10 files changed, 27 insertions, 41 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c03903963..846ab7ec9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Gitaly changelog
 
+## v1.0.0
+
+#### Added
+- Add gitaly-debug production debugging tool
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/967
+
+#### Fixed
+- Bump gitlab-markup to 1.6.5
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/975
+- Fix to reallow tcp URLs
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/974
+
+#### Other
+- Upgrade minimum required Git version to 2.18.0
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/958
+- Bump tzinfo to 1.2.5
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/977
+- Bump activesupport gem to 5.0.7
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/978
+- Propagate correlation-ids in from upstream services and out to Gitaly-Ruby
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/970
+
+#### Security
+- Bump nokogiri to 1.8.5
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/979
+
 ## v0.133.0
 
 #### Other
diff --git a/VERSION b/VERSION
index 244fb7efb..3eefcb9dd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.133.0
+1.0.0
diff --git a/changelogs/unreleased/an-corrrelation.yml b/changelogs/unreleased/an-corrrelation.yml
deleted file mode 100644
index 6a89a64eb..000000000
--- a/changelogs/unreleased/an-corrrelation.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Propagate correlation-ids in from upstream services and out to Gitaly-Ruby
-merge_request: 970
-author:
-type: other
diff --git a/changelogs/unreleased/fj-upgrade-git-to-2-18-0.yml b/changelogs/unreleased/fj-upgrade-git-to-2-18-0.yml
deleted file mode 100644
index 9abef816b..000000000
--- a/changelogs/unreleased/fj-upgrade-git-to-2-18-0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade minimum required Git version to 2.18.0
-merge_request: 958
-author:
-type: other
diff --git a/changelogs/unreleased/gitaly-debug.yml b/changelogs/unreleased/gitaly-debug.yml
deleted file mode 100644
index c0b940641..000000000
--- a/changelogs/unreleased/gitaly-debug.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add gitaly-debug production debugging tool
-merge_request: 967
-author:
-type: added
diff --git a/changelogs/unreleased/sh-bump-activesupport-5-0-7.yml b/changelogs/unreleased/sh-bump-activesupport-5-0-7.yml
deleted file mode 100644
index 2329048c6..000000000
--- a/changelogs/unreleased/sh-bump-activesupport-5-0-7.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump activesupport gem to 5.0.7
-merge_request: 978
-author:
-type: other
diff --git a/changelogs/unreleased/sh-bump-gitlab-markup-1-6-5.yml b/changelogs/unreleased/sh-bump-gitlab-markup-1-6-5.yml
deleted file mode 100644
index 3ae53dcfc..000000000
--- a/changelogs/unreleased/sh-bump-gitlab-markup-1-6-5.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump gitlab-markup to 1.6.5
-merge_request: 975
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-bump-nokogiri-1-8-5.yml b/changelogs/unreleased/sh-bump-nokogiri-1-8-5.yml
deleted file mode 100644
index 93a688246..000000000
--- a/changelogs/unreleased/sh-bump-nokogiri-1-8-5.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump nokogiri to 1.8.5
-merge_request: 979
-author:
-type: security
diff --git a/changelogs/unreleased/sh-bump-tzinfo.yml b/changelogs/unreleased/sh-bump-tzinfo.yml
deleted file mode 100644
index a7b8bd8bf..000000000
--- a/changelogs/unreleased/sh-bump-tzinfo.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump tzinfo to 1.2.5
-merge_request: 977
-author:
-type: other
diff --git a/changelogs/unreleased/tcp-fixes.yml b/changelogs/unreleased/tcp-fixes.yml
deleted file mode 100644
index f211a1b4e..000000000
--- a/changelogs/unreleased/tcp-fixes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix to reallow tcp URLs
-merge_request: 974
-author:
-type: fixed